From c889de02c584c90cee76fae26be5572e58b94599 Mon Sep 17 00:00:00 2001 From: dqwu Date: Tue, 2 Jul 2024 16:21:06 -0500 Subject: [PATCH 1/3] Fixing build error in anlgce.cmake (unknown EKAT_MPIRUN_EXE) Move two include statements to the end of anlgce.cmake to fix the build error "EKAT_MPIRUN_EXE is not known". --- components/eamxx/cmake/machine-files/anlgce.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/eamxx/cmake/machine-files/anlgce.cmake b/components/eamxx/cmake/machine-files/anlgce.cmake index 079000059d1..e79f7001547 100644 --- a/components/eamxx/cmake/machine-files/anlgce.cmake +++ b/components/eamxx/cmake/machine-files/anlgce.cmake @@ -1,12 +1,12 @@ include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) common_setup() -include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake) -include (${EKAT_MACH_FILES_PATH}/mpi/other.cmake) - # Remove this if you are using a resource manager (slurm etc) set (EKAT_TEST_LAUNCHER_MANAGE_RESOURCES True CACHE BOOL "") # EKAT MPI settings set (EKAT_MPIRUN_EXE "mpiexec" CACHE STRING "mpiexec") set (EKAT_MPI_NP_FLAG "-n" CACHE STRING "-n") + +include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake) +include (${EKAT_MACH_FILES_PATH}/mpi/other.cmake) From c533709f4ff112434dc1cef5a4336ad664dbcc73 Mon Sep 17 00:00:00 2001 From: dqwu Date: Wed, 29 May 2024 12:11:12 -0500 Subject: [PATCH 2/3] Adding cmake file for ANL UB22 workstation Adding cmake file for building SCREAM on ANL UB22 workstation --- .../eamxx/cmake/machine-files/anlgce-ub22.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 components/eamxx/cmake/machine-files/anlgce-ub22.cmake diff --git a/components/eamxx/cmake/machine-files/anlgce-ub22.cmake b/components/eamxx/cmake/machine-files/anlgce-ub22.cmake new file mode 100644 index 00000000000..e79f7001547 --- /dev/null +++ b/components/eamxx/cmake/machine-files/anlgce-ub22.cmake @@ -0,0 +1,12 @@ +include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) +common_setup() + +# Remove this if you are using a resource manager (slurm etc) +set (EKAT_TEST_LAUNCHER_MANAGE_RESOURCES True CACHE BOOL "") + +# EKAT MPI settings +set (EKAT_MPIRUN_EXE "mpiexec" CACHE STRING "mpiexec") +set (EKAT_MPI_NP_FLAG "-n" CACHE STRING "-n") + +include (${EKAT_MACH_FILES_PATH}/kokkos/openmp.cmake) +include (${EKAT_MACH_FILES_PATH}/mpi/other.cmake) From a9f16f1da78ac591faf91848de499b297a9c3a1b Mon Sep 17 00:00:00 2001 From: dqwu Date: Wed, 29 May 2024 13:33:50 -0500 Subject: [PATCH 3/3] Support for EAMXX/SCREAM testing in ANL GCE (UB22) Adding support for EAMXX standalone testing on ANL GCE (UB22) machine (Run EAMXX standalone tests on ANL GCE (UB22) using "./scripts/test-all-scream -m anlgce-ub22 ...") --- components/eamxx/scripts/machines_specs.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/eamxx/scripts/machines_specs.py b/components/eamxx/scripts/machines_specs.py index 9536d415c0d..43e5ebfa083 100644 --- a/components/eamxx/scripts/machines_specs.py +++ b/components/eamxx/scripts/machines_specs.py @@ -82,6 +82,10 @@ ["mpicxx","mpifort","mpicc"], "", ""), + "anlgce-ub22" : ([". /nfs/gce/software/custom/linux-ubuntu22.04-x86_64/spack/opt/spack/linux-ubuntu22.04-x86_64/gcc-11.2.0/lmod-8.5.6-hkjjxhp/lmod/lmod/init/sh", "module purge", "module load gcc/12.1.0", "export LD_LIBRARY_PATH=/nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/mpich/4.1.2/gcc-12.1.0/lib:$LD_LIBRARY_PATH", "export PATH=/nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/mpich/4.1.2/gcc-12.1.0/bin:/nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/netcdf/4.8.0c-4.3.1cxx-4.5.3f-serial/gcc-12.1.0/bin:$PATH", "export NetCDF_ROOT=/nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/netcdf/4.8.0c-4.3.1cxx-4.5.3f-serial/gcc-12.1.0", "export PERL5LIB=/nfs/gce/projects/climate/software/perl5/lib/perl5"], + ["mpicxx","mpifort","mpicc"], + "", + ""), "linux-generic" : ([],["mpicxx","mpifort","mpicc"],"", ""), "linux-generic-debug" : ([],["mpicxx","mpifort","mpicc"],"", ""), "linux-generic-serial" : ([],["mpicxx","mpifort","mpicc"],"", ""),