From 8c1c048ca2df217300873c69b668ae6b76f43eb8 Mon Sep 17 00:00:00 2001
From: Jeff Hammond <jeff.science@gmail.com>
Date: Sat, 3 Aug 2024 04:07:45 +0300
Subject: [PATCH] Remove Cray XT/XE (#339)

* 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

* remove __CRAYXE from CMake

* remove Cray XT/XE node detection
---
 CMakeLists.txt            |  4 ----
 cmx/src-mpi-pr/groups.c   | 15 ---------------
 comex/cmake/config.h.in   |  1 -
 comex/src-mpi-mt/groups.c | 15 ---------------
 comex/src-mpi-pr/groups.c | 15 ---------------
 comex/src-mpi-pt/groups.c | 15 ---------------
 6 files changed, 65 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46ae1f921..62c5084a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,10 +205,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/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 <mpi.h>
 
-#if defined(__CRAYXT) || defined(__CRAYXE)
-#  include <pmi.h> 
-#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/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
 
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 <mpi.h>
 
-#if defined(__CRAYXT) || defined(__CRAYXE)
-#  include <pmi.h>
-#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 <mpi.h>
 
-#if defined(__CRAYXT) || defined(__CRAYXE)
-#  include <pmi.h>
-#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 <mpi.h>
 
-#if defined(__CRAYXT) || defined(__CRAYXE)
-#  include <pmi.h>
-#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;
 }