Skip to content

Commit

Permalink
Remove Cray XT/XE (#339)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jeffhammond authored Aug 3, 2024
1 parent 227f8de commit 8c1c048
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 65 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
15 changes: 0 additions & 15 deletions cmx/src-mpi-pr/groups.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion comex/cmake/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#cmakedefine01 HAVE_SYS_WEAK_ALIAS_PRAGMA

#cmakedefine NDEBUG
#cmakedefine __CRAYXE

#cmakedefine01 ENABLE_SYSV

Expand Down
15 changes: 0 additions & 15 deletions comex/src-mpi-mt/groups.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
}
15 changes: 0 additions & 15 deletions comex/src-mpi-pr/groups.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
}
15 changes: 0 additions & 15 deletions comex/src-mpi-pt/groups.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
}

0 comments on commit 8c1c048

Please sign in to comment.