Remove BGQ (#338)

* remove BGQ alignment macro * remove BGQ filesystem stuff * remove BGQ compiler optimization flags * remove BGQ compiler detection * remove BGQ cross compilation detection * remove BGQ nodeid code * remove BGQ detection for ENABLE_UNNAMED_SEM * remove ENABLE_ARMCI_MEM_OPTION option for BGQ
GlobalArrays · Jul 31, 2024 · e157e0a · e157e0a
1 parent 3e2d1e1
commit e157e0a
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 104 deletions.
diff --git 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/cmx/src-mpi-pr/groups.c b/cmx/src-mpi-pr/groups.c
@@ -6,9 +6,7 @@
 
 #include <mpi.h>
 
-#if defined(__bgq__)
-#  include <mpix.h>
-#elif defined(__CRAYXT) || defined(__CRAYXE)
+#if defined(__CRAYXT) || defined(__CRAYXE)
 #  include <pmi.h> 
 #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/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/comex/src-mpi-mt/groups.c b/comex/src-mpi-mt/groups.c
@@ -9,9 +9,7 @@
 
 #include <mpi.h>
 
-#if defined(__bgq__)
-#  include <mpix.h>
-#elif defined(__CRAYXT) || defined(__CRAYXE)
+#if defined(__CRAYXT) || defined(__CRAYXE)
 #  include <pmi.h>
 #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/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-pr/groups.c b/comex/src-mpi-pr/groups.c
@@ -10,10 +10,8 @@
 
 #include <mpi.h>
 
-#if defined(__bgq__)
-#  include <mpix.h>
-#elif defined(__CRAYXT) || defined(__CRAYXE)
-#  include <pmi.h> 
+#if defined(__CRAYXT) || defined(__CRAYXE)
+#  include <pmi.h>
 #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/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

diff --git a/comex/src-mpi-pt/groups.c b/comex/src-mpi-pt/groups.c
@@ -9,9 +9,7 @@
 
 #include <mpi.h>
 
-#if defined(__bgq__)
-#  include <mpix.h>
-#elif defined(__CRAYXT) || defined(__CRAYXE)
+#if defined(__CRAYXT) || defined(__CRAYXE)
 #  include <pmi.h>
 #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)

diff --git 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/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"],
 [IBM64:*:*:*],              [armci_cv_c_opt="-O3 -qinline=100 -qstrict -qarch=auto -qtune=auto"],
 [IBM:*:*:*],                [armci_cv_c_opt="-O3 -qinline=100 -qstrict -qarch=auto -qtune=auto"],

diff --git 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=],
 [IBM64:*:*:*],                  [armci_cv_f77_opt=],
 [IBM:*:*:*],                    [armci_cv_f77_opt="-O4 -qarch=auto -qstrict"],

diff --git 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=],
 [IBM64:*:*],                [ga_cv_c_opt=],
 [IBM:*:*],                  [ga_cv_c_opt=],

diff --git 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
diff --git 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=],
 [IBM64:*:*],                [ga_cv_f77_opt="-qarch=auto"],
 [IBM:*:*],                  [ga_cv_f77_opt="-qarch=auto"],

diff --git 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
@@ -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
@@ -64,9 +64,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"])

diff --git a/m4/ma_enable_armci_mem.m4 b/m4/ma_enable_armci_mem.m4
diff --git 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)
@@ -97,11 +100,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), \

diff --git 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 <sys/vfs.h>
 #        define  STATVFS statfs
 #        define NO_F_FRSIZE 

diff --git 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