From d389e9968f06590b84376af9b22e7acae8af87e3 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:03:25 +0300 Subject: [PATCH 01/10] remove BGQ alignment macro --- ma/ma.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ma/ma.c b/ma/ma.c index e18afdf21..5fb459ad1 100644 --- a/ma/ma.c +++ b/ma/ma.c @@ -97,11 +97,7 @@ extern void* ARMCI_Malloc_local(long bytes); * problem is solved, but the sum of sizes of preceding fields can * still potentially cause difficulty. */ -#if defined(BGQ) -#define ALIGNMENT 32 -#else #define ALIGNMENT sizeof(size_t) -#endif /* min size of block split and placed on free list */ #define MINBLOCKSIZE mai_round((size_t)(ALIGNMENT + BLOCK_OVERHEAD_FIXED), \ From 999ef8600f4ee0f38ae917c787135355b3b52eab Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:03:03 +0300 Subject: [PATCH 02/10] remove BGQ filesystem stuff --- pario/elio/eliop.h | 2 +- pario/makefile.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pario/elio/eliop.h b/pario/elio/eliop.h index 339a5ae43..3bbee87ab 100644 --- a/pario/elio/eliop.h +++ b/pario/elio/eliop.h @@ -36,7 +36,7 @@ extern void GA_Error(char*, int); # define STATVFS _stat # define S_ISDIR(mode) ((mode&S_IFMT) == S_IFDIR) # define S_ISREG(mode) ((mode&S_IFMT) == S_IFREG) -#elif defined(LINUX) || defined(CYGWIN) || defined(BGQ) || defined(__GLIBC__) +#elif defined(LINUX) || defined(CYGWIN) || defined(__GLIBC__) # include # define STATVFS statfs # define NO_F_FRSIZE diff --git a/pario/makefile.h b/pario/makefile.h index 8f5559a7c..d2f3b78d9 100644 --- a/pario/makefile.h +++ b/pario/makefile.h @@ -47,10 +47,6 @@ ifdef LARGE_FILES LIB_DEFINES += $(shell getconf LFS_CFLAGS) endif - ifeq ($(TARGET), BGQ) - LIB_DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - endif - LIB_DEFINES += -DLARGE_FILES endif From 0dd0e623634236386d60ea350ffd0c4adab1f6e2 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:04:33 +0300 Subject: [PATCH 03/10] remove BGQ compiler optimization flags --- m4/armci_c_opt.m4 | 2 -- m4/armci_f77_opt.m4 | 2 -- m4/ga_c_opt.m4 | 2 -- m4/ga_f77_opt.m4 | 2 -- 4 files changed, 8 deletions(-) diff --git a/m4/armci_c_opt.m4 b/m4/armci_c_opt.m4 index fbc6247dc..32defcccf 100644 --- a/m4/armci_c_opt.m4 +++ b/m4/armci_c_opt.m4 @@ -10,8 +10,6 @@ AC_CACHE_CHECK([for specific C optimizations], [armci_cv_c_opt], [ AS_IF([test "x$ARMCI_COPT" != x], [armci_cv_c_opt="$ARMCI_COPT"], [armci_cv_c_opt=]) AS_IF([test "x$armci_cv_c_opt" = x && test "x$enable_opt" = xyes], [ AS_CASE([$ga_cv_target:$ga_cv_c_compiler_vendor:$host_cpu:$ga_armci_network], -[BGQ:ibm:*:*], [armci_cv_c_opt="-O3 -qstrict -qarch=qp -qtune=qp"], -[BGQ:gnu:*:*], [armci_cv_c_opt="-O2"], [CYGWIN:*:*:*], [armci_cv_c_opt="-malign-double"], [FUJITSU_VPP64:*:*:*], [armci_cv_c_opt="-x100"], [FUJITSU_VPP:*:*:*], [armci_cv_c_opt="-x100 -KA32"], diff --git a/m4/armci_f77_opt.m4 b/m4/armci_f77_opt.m4 index 06719cbcc..cfca024bb 100644 --- a/m4/armci_f77_opt.m4 +++ b/m4/armci_f77_opt.m4 @@ -10,8 +10,6 @@ AC_CACHE_CHECK([for specific Fortran optimizations], [armci_cv_f77_opt], [ AS_IF([test "x$ARMCI_FOPT" != x], [armci_cv_f77_opt="$ARMCI_FOPT"], [armci_cv_f77_opt=]) AS_IF([test "x$armci_cv_f77_opt" = x && test "x$enable_opt" = xyes], [ AS_CASE([$ga_cv_target:$ga_cv_f77_compiler_vendor:$host_cpu:$ga_armci_network], -[BGQ:ibm:*:*], [armci_cv_f77_opt="-O3 -qstrict -qarch=qp -qtune=qp"], -[BGQ:gnu:*:*], [armci_cv_f77_opt="-O2"], [CYGWIN:*:*:*], [armci_cv_f77_opt=], [FUJITSU_VPP64:*:*:*], [armci_cv_f77_opt="-Sw"], [FUJITSU_VPP:*:*:*], [armci_cv_f77_opt="-Sw -KA32"], diff --git a/m4/ga_c_opt.m4 b/m4/ga_c_opt.m4 index 511314b7e..c2261daca 100644 --- a/m4/ga_c_opt.m4 +++ b/m4/ga_c_opt.m4 @@ -9,8 +9,6 @@ AC_CACHE_CHECK([for specific C optimizations], [ga_cv_c_opt], [ AS_IF([test "x$GA_COPT" != x], [ga_cv_c_opt="$GA_COPT"], [ga_cv_c_opt=]) AS_IF([test "x$ga_cv_c_opt" = x && test "x$enable_opt" = xyes], [ AS_CASE([$ga_cv_target:$ga_cv_c_compiler_vendor:$host_cpu], -[BGQ:ibm:*], [ga_cv_c_opt="-O3 -qstrict -qarch=qp -qtune=qp"], -[BGQ:gnu:*], [ga_cv_c_opt="-O2"], [CYGWIN:*:*], [ga_cv_c_opt=], [FUJITSU_VPP64:*:*], [ga_cv_c_opt=], [FUJITSU_VPP:*:*], [ga_cv_c_opt="-KA32"], diff --git a/m4/ga_f77_opt.m4 b/m4/ga_f77_opt.m4 index 1b199f021..b641495f0 100644 --- a/m4/ga_f77_opt.m4 +++ b/m4/ga_f77_opt.m4 @@ -9,8 +9,6 @@ AC_CACHE_CHECK([for specific Fortran optimizations], [ga_cv_f77_opt], [ AS_IF([test "x$GA_FOPT" != x], [ga_cv_f77_opt="$GA_FOPT"], [ga_cv_f77_opt=]) AS_IF([test "x$ga_cv_f77_opt" = x && test "x$enable_opt" = xyes], [ AS_CASE([$ga_cv_target:$ga_cv_f77_compiler_vendor:$host_cpu], -[BGQ:ibm:*], [ga_cv_f77_opt="-O3 -qstrict -qarch=qp -qtune=qp"], -[BGQ:gnu:*], [ga_cv_f77_opt="-O2"], [CYGWIN:*:*], [ga_cv_f77_opt=], [FUJITSU_VPP64:*:*], [ga_cv_f77_opt="-Sw"], [FUJITSU_VPP:*:*], [ga_cv_f77_opt="-Sw -KA32"], From e50fc370aa73d979e275e3bd173f1e1052065e52 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:05:18 +0300 Subject: [PATCH 04/10] remove BGQ compiler detection --- comex/m4/comex_mpicc.m4 | 3 --- m4/ga_mpicc.m4 | 3 --- m4/ga_mpicxx.m4 | 3 --- m4/ga_mpif77.m4 | 3 --- 4 files changed, 12 deletions(-) diff --git a/comex/m4/comex_mpicc.m4 b/comex/m4/comex_mpicc.m4 index a529c8568..895bfabd8 100644 --- a/comex/m4/comex_mpicc.m4 +++ b/comex/m4/comex_mpicc.m4 @@ -33,9 +33,6 @@ # AC_DEFUN([COMEX_PROG_MPICC], [AC_ARG_VAR([MPICC], [MPI C compiler]) -AS_CASE([$comex_cv_target_base], -[BGQ], [comex_mpicc_pref=mpixlc_r; comex_cc_pref=bgxlc_r], -[]) # In the case of using MPI wrappers, set CC=MPICC since CC will override # absolutely everything in our list of compilers. # Save CC, just in case. diff --git a/m4/ga_mpicc.m4 b/m4/ga_mpicc.m4 index a54cfaa40..90892023f 100644 --- a/m4/ga_mpicc.m4 +++ b/m4/ga_mpicc.m4 @@ -33,9 +33,6 @@ # AC_DEFUN([GA_PROG_MPICC], [AC_ARG_VAR([MPICC], [MPI C compiler]) -AS_CASE([$ga_cv_target_base], -[BGQ], [ga_mpicc_pref=mpixlc_r; ga_cc_pref=bgxlc_r], -[]) # In the case of using MPI wrappers, set CC=MPICC since CC will override # absolutely everything in our list of compilers. # Save CC, just in case. diff --git a/m4/ga_mpicxx.m4 b/m4/ga_mpicxx.m4 index 3829447ec..6e0147289 100644 --- a/m4/ga_mpicxx.m4 +++ b/m4/ga_mpicxx.m4 @@ -43,9 +43,6 @@ # AC_DEFUN([GA_PROG_MPICXX], [AC_ARG_VAR([MPICXX], [MPI C++ compiler]) -AS_CASE([$ga_cv_target_base], -[BGQ], [ga_mpicxx_pref=mpixlcxx_r; ga_cxx_pref=bgxlC_r], -[]) # In the case of using MPI wrappers, set CXX=MPICXX since CXX will override # absolutely everything in our list of compilers. AS_IF([test x$with_mpi_wrappers = xyes], diff --git a/m4/ga_mpif77.m4 b/m4/ga_mpif77.m4 index 30dbcde5d..125c9cc75 100644 --- a/m4/ga_mpif77.m4 +++ b/m4/ga_mpif77.m4 @@ -67,9 +67,6 @@ # AC_DEFUN([GA_PROG_MPIF77], [AC_ARG_VAR([MPIF77], [MPI Fortran 77 compiler]) -AS_CASE([$ga_cv_target_base], -[BGQ], [ga_mpif77_pref=mpixlf77_r;ga_f77_pref=bgxlf_r], -[]) # If FC is set, override F77. Similarly for MPIFC/MPIF77 and FCFLAGS/FFLAGS. AS_IF([test "x$FC" != x], [F77="$FC"]) AS_IF([test "x$MPIFC" != x], [MPIF77="$MPIFC"]) From c52ac7505bc571471f015e58619208d58900dd08 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:05:32 +0300 Subject: [PATCH 05/10] remove BGQ cross compilation detection --- m4/ga_cross_compiling.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/m4/ga_cross_compiling.m4 b/m4/ga_cross_compiling.m4 index a8c5a6b28..c64f243d2 100644 --- a/m4/ga_cross_compiling.m4 +++ b/m4/ga_cross_compiling.m4 @@ -8,7 +8,6 @@ AC_DEFUN([GA_CROSS_COMPILING], [ AC_REQUIRE([GA_TARGET]) AC_CACHE_CHECK([whether we are cross compiling], [ga_cv_cross_compiling], - [AS_IF([test "x$ga_cv_target_base" = xBGQ], [cross_compiling=yes]) - ga_cv_cross_compiling=$cross_compiling]) + [ga_cv_cross_compiling=$cross_compiling]) AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) ])dnl From d425e7e037ac2b9b4b17560c7644cf4d080edb13 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:06:37 +0300 Subject: [PATCH 06/10] remove BGQ nodeid code --- cmx/src-mpi-pr/groups.c | 17 ++--------------- comex/src-mpi-mt/groups.c | 17 ++--------------- comex/src-mpi-pr/groups.c | 19 +++---------------- comex/src-mpi-pt/groups.c | 17 ++--------------- 4 files changed, 9 insertions(+), 61 deletions(-) diff --git a/cmx/src-mpi-pr/groups.c b/cmx/src-mpi-pr/groups.c index 8768fd2fe..cd192f4bf 100644 --- a/cmx/src-mpi-pr/groups.c +++ b/cmx/src-mpi-pr/groups.c @@ -6,9 +6,7 @@ #include -#if defined(__bgq__) -# include -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) # include #endif @@ -595,18 +593,7 @@ void cmx_group_finalize() static long xgethostid() { -#if defined(__bgq__) -#warning BGQ - int nodeid; - MPIX_Hardware_t hw; - MPIX_Hardware(&hw); - - nodeid = hw.Coords[0] * hw.Size[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[3] * hw.Size[4] - + hw.Coords[4]; -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) #warning CRAY int nodeid; # if defined(__CRAYXT) diff --git a/comex/src-mpi-mt/groups.c b/comex/src-mpi-mt/groups.c index b4ed57dc0..8440c1b9c 100644 --- a/comex/src-mpi-mt/groups.c +++ b/comex/src-mpi-mt/groups.c @@ -9,9 +9,7 @@ #include -#if defined(__bgq__) -# include -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) # include #endif @@ -468,18 +466,7 @@ void comex_group_finalize() static long xgethostid() { -#if defined(__bgq__) -#warning BGQ - int nodeid; - MPIX_Hardware_t hw; - MPIX_Hardware(&hw); - - nodeid = hw.Coords[0] * hw.Size[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[3] * hw.Size[4] - + hw.Coords[4]; -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) #warning CRAY int nodeid; # if defined(__CRAYXT) diff --git a/comex/src-mpi-pr/groups.c b/comex/src-mpi-pr/groups.c index 5da86ee3c..ccf89f30a 100644 --- a/comex/src-mpi-pr/groups.c +++ b/comex/src-mpi-pr/groups.c @@ -10,10 +10,8 @@ #include -#if defined(__bgq__) -# include -#elif defined(__CRAYXT) || defined(__CRAYXE) -# include +#if defined(__CRAYXT) || defined(__CRAYXE) +# include #endif #include "comex.h" @@ -619,18 +617,7 @@ void comex_group_finalize() static long xgethostid() { -#if defined(__bgq__) -#warning BGQ - int nodeid; - MPIX_Hardware_t hw; - MPIX_Hardware(&hw); - - nodeid = hw.Coords[0] * hw.Size[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[3] * hw.Size[4] - + hw.Coords[4]; -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) #warning CRAY int nodeid; # if defined(__CRAYXT) diff --git a/comex/src-mpi-pt/groups.c b/comex/src-mpi-pt/groups.c index b23de38c9..9ded613b9 100644 --- a/comex/src-mpi-pt/groups.c +++ b/comex/src-mpi-pt/groups.c @@ -9,9 +9,7 @@ #include -#if defined(__bgq__) -# include -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) # include #endif @@ -504,18 +502,7 @@ void comex_group_finalize() static long xgethostid() { -#if defined(__bgq__) -#warning BGQ - int nodeid; - MPIX_Hardware_t hw; - MPIX_Hardware(&hw); - - nodeid = hw.Coords[0] * hw.Size[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[1] * hw.Size[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[2] * hw.Size[3] * hw.Size[4] - + hw.Coords[3] * hw.Size[4] - + hw.Coords[4]; -#elif defined(__CRAYXT) || defined(__CRAYXE) +#if defined(__CRAYXT) || defined(__CRAYXE) #warning CRAY int nodeid; # if defined(__CRAYXT) From 789cd67365950c424fed3df08a9de780cb5707d6 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:07:13 +0300 Subject: [PATCH 07/10] remove BGQ detection for ENABLE_UNNAMED_SEM --- cmx/src-mpi-pr/cmx_impl.h | 2 +- comex/src-mpi-pr/comex_impl.h | 2 +- comex/src-mpi-pt/comex_impl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmx/src-mpi-pr/cmx_impl.h b/cmx/src-mpi-pr/cmx_impl.h index 1e2214397..4c35cc0ae 100644 --- a/cmx/src-mpi-pr/cmx_impl.h +++ b/cmx/src-mpi-pr/cmx_impl.h @@ -12,7 +12,7 @@ #define CMX_STATIC_BUFFER_SIZE (2u*1048576u) #define SHM_NAME_SIZE 31 #define UNLOCKED -1 /* performance or correctness related settings */ -#if defined(__bgq__) +#if 0 #define ENABLE_UNNAMED_SEM 1 #else #define ENABLE_UNNAMED_SEM 0 diff --git a/comex/src-mpi-pr/comex_impl.h b/comex/src-mpi-pr/comex_impl.h index 45d4e1965..a188d6e2c 100644 --- a/comex/src-mpi-pr/comex_impl.h +++ b/comex/src-mpi-pr/comex_impl.h @@ -15,7 +15,7 @@ #define UNLOCKED -1 /* performance or correctness related settings */ -#if defined(__bgq__) +#if 0 #define ENABLE_UNNAMED_SEM 1 #else #define ENABLE_UNNAMED_SEM 0 diff --git a/comex/src-mpi-pt/comex_impl.h b/comex/src-mpi-pt/comex_impl.h index 176fcccb8..3291522b0 100644 --- a/comex/src-mpi-pt/comex_impl.h +++ b/comex/src-mpi-pt/comex_impl.h @@ -15,7 +15,7 @@ #define UNLOCKED -1 /* performance or correctness related settings */ -#if defined(__bgq__) +#if 0 #define ENABLE_UNNAMED_SEM 1 #else #define ENABLE_UNNAMED_SEM 0 From 22a7ac21f39669ad38f0648af1cedd7683713cd6 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:27:27 +0300 Subject: [PATCH 08/10] remove ENABLE_ARMCI_MEM_OPTION option for BGQ --- configure.ac | 1 - m4/ma_enable_armci_mem.m4 | 8 -------- ma/ma.c | 3 +++ 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 m4/ma_enable_armci_mem.m4 diff --git a/configure.ac b/configure.ac index f477c4f51..5d38a4412 100644 --- a/configure.ac +++ b/configure.ac @@ -529,7 +529,6 @@ ARMCI_SETUP # Set up MA. MA_ENABLE_CUDA_MEM -MA_ENABLE_ARMCI_MEM_OPTION MA_LONG_DOUBLE_TYPEDEF MA_STATS MA_VERIFY diff --git a/m4/ma_enable_armci_mem.m4 b/m4/ma_enable_armci_mem.m4 deleted file mode 100644 index 0d2a8186f..000000000 --- a/m4/ma_enable_armci_mem.m4 +++ /dev/null @@ -1,8 +0,0 @@ -# MA_ENABLE_ARMCI_MEM_OPTION -# ------------------------------ -# Whether to enable ARMCI in MA. -AC_DEFUN([MA_ENABLE_ARMCI_MEM_OPTION], -[AS_IF([test x$TARGET != xBGQ], - [AC_DEFINE([ENABLE_ARMCI_MEM_OPTION], [1], [enables ARMCI in MA])]) -AM_CONDITIONAL([ENABLE_ARMCI_MEM_OPTION], [test x$TARGET != xBGQ]) -])dnl diff --git a/ma/ma.c b/ma/ma.c index 5fb459ad1..d93f3a2e2 100644 --- a/ma/ma.c +++ b/ma/ma.c @@ -25,6 +25,9 @@ #include "scope.h" #include "table.h" +// this was only ever disabled for Blue Gene, which has been removed. +#define ENABLE_ARMCI_MEM_OPTION 1 + #if defined(ENABLE_CUDA_MEM) extern int cudaMallocManaged(void** devPtr, size_t size, unsigned int flags); #elif defined(ENABLE_ARMCI_MEM_OPTION) From 7deee47e35043305001a80314048444223dc7bc3 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:40:37 +0300 Subject: [PATCH 09/10] remove __CRAYXE from CMake --- CMakeLists.txt | 4 ---- comex/cmake/config.h.in | 1 - 2 files changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17366ccb8..3fade8d26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,10 +198,6 @@ set (USE_MALLOC 0) if(ENABLE_PROFILING) set (GA_PROFILING 1) endif() -if(USE_CRAYSHASTA) - set(__CRAYXE 1) - # list(APPEND GA_EXTRA_LIBS pmi2) -endif() # hardwire ARMCI configuration options set (HAVE_ARMCI_GROUP_COMM 1) diff --git a/comex/cmake/config.h.in b/comex/cmake/config.h.in index 65b84665f..17027da37 100644 --- a/comex/cmake/config.h.in +++ b/comex/cmake/config.h.in @@ -33,7 +33,6 @@ #cmakedefine01 HAVE_SYS_WEAK_ALIAS_PRAGMA #cmakedefine NDEBUG -#cmakedefine __CRAYXE #cmakedefine01 ENABLE_SYSV From 027d6e8e988d269142a2455a4e57ca4cff8cb07e Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Wed, 31 Jul 2024 11:41:10 +0300 Subject: [PATCH 10/10] remove Cray XT/XE node detection --- cmx/src-mpi-pr/groups.c | 15 --------------- comex/src-mpi-mt/groups.c | 15 --------------- comex/src-mpi-pr/groups.c | 15 --------------- comex/src-mpi-pt/groups.c | 15 --------------- 4 files changed, 60 deletions(-) diff --git a/cmx/src-mpi-pr/groups.c b/cmx/src-mpi-pr/groups.c index cd192f4bf..f0b6ac84a 100644 --- a/cmx/src-mpi-pr/groups.c +++ b/cmx/src-mpi-pr/groups.c @@ -6,10 +6,6 @@ #include -#if defined(__CRAYXT) || defined(__CRAYXE) -# include -#endif - #include "cmx.h" #include "cmx_impl.h" #include "groups.h" @@ -593,17 +589,6 @@ void cmx_group_finalize() static long xgethostid() { -#if defined(__CRAYXT) || defined(__CRAYXE) -#warning CRAY - int nodeid; -# if defined(__CRAYXT) - PMI_Portals_get_nid(g_state.rank, &nodeid); -# elif defined(__CRAYXE) - PMI_Get_nid(g_state.rank, &nodeid); -# endif -#else long nodeid = gethostid(); -#endif - return nodeid; } diff --git a/comex/src-mpi-mt/groups.c b/comex/src-mpi-mt/groups.c index 8440c1b9c..aafe6ee16 100644 --- a/comex/src-mpi-mt/groups.c +++ b/comex/src-mpi-mt/groups.c @@ -9,10 +9,6 @@ #include -#if defined(__CRAYXT) || defined(__CRAYXE) -# include -#endif - #include "comex.h" #include "comex_impl.h" #include "groups.h" @@ -466,17 +462,6 @@ void comex_group_finalize() static long xgethostid() { -#if defined(__CRAYXT) || defined(__CRAYXE) -#warning CRAY - int nodeid; -# if defined(__CRAYXT) - PMI_Portals_get_nid(g_state.rank, &nodeid); -# elif defined(__CRAYXE) - PMI_Get_nid(g_state.rank, &nodeid); -# endif -#else long nodeid = gethostid(); -#endif - return nodeid; } diff --git a/comex/src-mpi-pr/groups.c b/comex/src-mpi-pr/groups.c index ccf89f30a..236422193 100644 --- a/comex/src-mpi-pr/groups.c +++ b/comex/src-mpi-pr/groups.c @@ -10,10 +10,6 @@ #include -#if defined(__CRAYXT) || defined(__CRAYXE) -# include -#endif - #include "comex.h" #include "comex_impl.h" #include "groups.h" @@ -617,17 +613,6 @@ void comex_group_finalize() static long xgethostid() { -#if defined(__CRAYXT) || defined(__CRAYXE) -#warning CRAY - int nodeid; -# if defined(__CRAYXT) - PMI_Portals_get_nid(g_state.rank, &nodeid); -# elif defined(__CRAYXE) - PMI_Get_nid(g_state.rank, &nodeid); -# endif -#else long nodeid = gethostid(); -#endif - return nodeid; } diff --git a/comex/src-mpi-pt/groups.c b/comex/src-mpi-pt/groups.c index 9ded613b9..37bb6ed7f 100644 --- a/comex/src-mpi-pt/groups.c +++ b/comex/src-mpi-pt/groups.c @@ -9,10 +9,6 @@ #include -#if defined(__CRAYXT) || defined(__CRAYXE) -# include -#endif - #include "comex.h" #include "comex_impl.h" #include "groups.h" @@ -502,17 +498,6 @@ void comex_group_finalize() static long xgethostid() { -#if defined(__CRAYXT) || defined(__CRAYXE) -#warning CRAY - int nodeid; -# if defined(__CRAYXT) - PMI_Portals_get_nid(g_state.rank, &nodeid); -# elif defined(__CRAYXE) - PMI_Get_nid(g_state.rank, &nodeid); -# endif -#else long nodeid = gethostid(); -#endif - return nodeid; }