Add mpi-crayshasta build

Author: rbuch

CMakeLists.txt

@@ -71,6 +71,10 @@ if(CMAKE_Fortran_COMPILER)
   include(FortranCInterface)
   FortranCInterface_VERIFY()
   FortranCInterface_VERIFY(CXX)
+  if(CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
+    # Needed to make lowercase modules on Cray platforms
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ef")
+  endif()
 else()
   message(STATUS "Charm++: No Fortran support.")
 endif()
@@ -386,7 +390,7 @@ set(CMK_BUILD_CRAY 0)
 if(${NETWORK} MATCHES "gni-")
   set(CHARM_PLATFORM "${NETWORK}")
   set(CMK_BUILD_CRAY 1)
-elseif(${NETWORK} MATCHES "mpi-crayx")
+elseif(${NETWORK} MATCHES "mpi-cray")
   set(CHARM_PLATFORM "${NETWORK}")
 endif()
 
@@ -560,7 +564,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/src/arch/${NETWORK}/gdir_link)
   file(STRINGS src/arch/${NETWORK}/gdir_link GDIR)
 elseif(${NETWORK} MATCHES "gni-")
   set(GDIR "gni")
-elseif(${NETWORK} MATCHES "mpi-crayx")
+elseif(${NETWORK} MATCHES "mpi-cray")
   set(GDIR "mpi")
 else()
   set(GDIR ${NETWORK})
@@ -905,7 +909,7 @@ file(APPEND  ${optfile_sh} "[ -z \"$CHARMINC\" ] && CHARMINC=\".\"\n")
 # This needs to appear before sourcing the cc-$compiler.sh file
 file(APPEND  ${optfile_sh} "CMK_COMPILER_SUFFIX=${CMK_COMPILER_SUFFIX}\n")
 
-if(NOT ${NETWORK} STREQUAL "mpi" AND NOT ${NETWORK} MATCHES "gni-" AND NOT ${NETWORK} MATCHES "-crayx")
+if(NOT ${NETWORK} STREQUAL "mpi" AND NOT ${NETWORK} MATCHES "gni-" AND NOT ${NETWORK} MATCHES "-cray")
     file(APPEND ${optfile_sh} ". ${CMAKE_BINARY_DIR}/include/cc-${CMK_COMPILER}.sh\n")
 endif()
 
@@ -950,7 +954,7 @@ foreach(l CMK_AMPI_WITH_ROMIO CMK_OPTIMIZE CMK_AMPI_ONLY CMK_POST_EXE CMK_SHARED
     file(APPEND ${optfile_h} "#define ${l} ${${l}}\n")
 endforeach(l)
 
-if(NOT ${NETWORK} STREQUAL "mpi" AND NOT ${NETWORK} MATCHES "gni-" AND NOT ${NETWORK} MATCHES "-crayx")
+if(NOT ${NETWORK} STREQUAL "mpi" AND NOT ${NETWORK} MATCHES "gni-" AND NOT ${NETWORK} MATCHES "-cray")
     file(APPEND ${optfile_h} "#include \"cc-${CMK_COMPILER}.h\"\n")
 endif()
 

buildcmake

@@ -493,7 +493,7 @@ if [[ $opt_ampi_only -eq 1 ]]; then
 fi
 
 # Special handling for gni-crayxc, gni-crayxe, mpi-crayxc, mpi-crayxe
-if [[ $actual_triplet == gni-* || $actual_triplet == *-crayx? ]]; then
+if [[ $actual_triplet == gni-* || $actual_triplet == *-cray* ]]; then
   opt_network=$actual_triplet
   # Need to use Cray's compiler frontends on Cray systems
   opt_CC=cc

src/arch/common/conv-mach-craype.sh

@@ -16,7 +16,12 @@ CMK_CPP_C_FLAGS="-E"
 
 CMK_LINK_BINARY='-dynamic'
 
-CMK_CRAY_LIBS="$CRAY_PMI_POST_LINK_OPTS $CRAY_UGNI_POST_LINK_OPTS -lugni -lpmi $CRAY_RCA_POST_LINK_OPTS"
+if test -v CMK_CRAY_NOGNI
+then
+    CMK_CRAY_LIBS="$CRAY_PMI_POST_LINK_OPTS -lpmi $CRAY_RCA_POST_LINK_OPTS"
+else
+    CMK_CRAY_LIBS="$CRAY_PMI_POST_LINK_OPTS $CRAY_UGNI_POST_LINK_OPTS -lugni -lpmi $CRAY_RCA_POST_LINK_OPTS"
+fi
 CMK_LIBS="-lckqt $CMK_CRAY_LIBS"
 
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"

src/arch/mpi-crayshasta/conv-mach-smp.h

@@ -0,0 +1,7 @@
+#define CMK_SMP                                            1
+
+
+#undef CMK_SHARED_VARS_UNAVAILABLE
+#undef CMK_SHARED_VARS_POSIX_THREADS_SMP
+#define CMK_SHARED_VARS_UNAVAILABLE                        0
+#define CMK_SHARED_VARS_POSIX_THREADS_SMP                  1

src/arch/mpi-crayshasta/conv-mach-smp.sh

@@ -0,0 +1,3 @@
+CMK_DEFS="$CMK_DEFS -D_REENTRANT"
+CMK_LIBS="-lpthread $CMK_LIBS "
+CMK_SMP="1"

src/arch/mpi-crayshasta/conv-mach.h

@@ -0,0 +1,52 @@
+
+#ifndef _CONV_MACH_H
+#define _CONV_MACH_H
+
+#define CMK_CONVERSE_MPI                                   1
+
+#define CMK_MEMORY_PREALLOCATE_HACK			   0
+
+#define CMK_DEFAULT_MAIN_USES_COMMON_CODE                  1
+
+#define CMK_MALLOC_USE_GNU_MALLOC                          0
+#define CMK_MALLOC_USE_OS_BUILTIN                          1
+
+#define CMI_IO_BUFFER_EXPLICIT                             1
+#define CMI_IO_FLUSH_USER                                  1
+
+#define CMK_GETPAGESIZE_AVAILABLE			   1
+#define CMK_MEMORY_PAGESIZE				   4096
+#define CMK_MEMORY_PROTECTABLE				   0
+
+
+#define CMK_SHARED_VARS_UNAVAILABLE                        1
+
+#define CMK_SIGNAL_NOT_NEEDED                              0
+#define CMK_SIGNAL_USE_SIGACTION                           0
+#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
+
+#define CMK_THREADS_USE_CONTEXT                            0
+#define CMK_THREADS_USE_FCONTEXT                           1
+#define CMK_THREADS_USE_JCONTEXT                           0
+#define CMK_THREADS_USE_PTHREADS                           0
+
+#define CMK_TIMER_USE_GETRUSAGE                            0
+#define CMK_TIMER_USE_SPECIAL                              1
+#define CMK_TIMER_USE_TIMES                                0
+
+
+#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
+#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
+
+#define CMK_64BIT					   1
+#define CMK_AMD64					   1
+
+#define CMK_WEB_MODE                                       1
+#define CMK_DEBUG_MODE                                     0
+
+#define CMK_LBDB_ON					   1
+
+#define CMK_DISABLE_SYNC                                   1
+
+#endif
+

src/arch/mpi-crayshasta/conv-mach.sh

@@ -0,0 +1,23 @@
+#  Cray Shasta build.  October 2021.
+#  CRAY COMPILER (CCE) BUILD
+#  ========================================
+#  module load PrgEnv-cray         # typically default
+#
+#  INTEL BUILD
+#  ================================
+#  module swap PrgEnv-cray PrgEnv-intel
+#
+#  GCC BUILD
+#  ================================
+#  module swap PrgEnv-cray PrgEnv-gnu
+#
+#  # Build command is the same regardless of compiler environment:
+#
+#  # MPI build
+#  ./build charm++ mpi-crayshasta smp --with-production
+
+CMK_BUILD_CRAY=1
+
+CMK_CRAY_NOGNI=1
+
+. $CHARMINC/conv-mach-craype.sh