Skip to content

Commit

Permalink
Merge pull request #1228 from ndellingwood/update-testscripts-semsarc…
Browse files Browse the repository at this point in the history 
…hive

Update sems module naming for testing scripts
  • Loading branch information
@ndellingwood
ndellingwood authored Dec 17, 2021
2 parents 6aa2a9f + a82de75 commit 598ac78
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 46 deletions.
86 changes: 43 additions & 43 deletions scripts/cm_test_all_sandia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ fi
if [ ! -z "$SEMS_MODULEFILES_ROOT" ]; then
if [[ "$MACHINE" = "" ]]; then
MACHINE=sems
module load sems-git
module load sems-archive-git
fi
fi

Expand Down Expand Up @@ -414,16 +414,16 @@ fi
#

if [ "$MACHINE" = "sems" ]; then
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-modules-init.sh"
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh"
eval "$MODULE_ENVIRONMENT"

# On unnamed sems machines, assume more restricted rhel7 environment
# On rhel7 sems machines gcc/7.3.0, clang/4.0.1, and intel/16.0.3 are missing
# Remove kokkkos-env module use

module load sems-cmake/3.17.1
BASE_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA9_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.2.0"
module load sems-archive-cmake/3.17.1
BASE_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA9_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/7.2.0"
SKIP_HWLOC=True
# No sems hwloc module

Expand Down Expand Up @@ -466,12 +466,12 @@ if [ "$MACHINE" = "sems" ]; then
SPACK_CUDA_ARCH="+maxwell50" #use an old one
SPACK_CUDA_HOST_COMPILER="%gcc@7.2.0"
elif [ "$MACHINE" = "sogpu" ]; then
source /projects/sems/modulefiles/utils/sems-modules-init.sh
source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh

module load sems-cmake/3.17.1 sems-git
BASE_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.2.0"
CUDA11_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/8.3.0"
module load sems-archive-cmake/3.17.1 sems-archive-git
BASE_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/7.2.0"
CUDA11_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/8.3.0"
SKIP_HWLOC=True
# No sems hwloc module

Expand All @@ -498,15 +498,15 @@ elif [ "$MACHINE" = "sogpu" ]; then
"cuda/11.1 $CUDA11_MODULE_LIST $CUDA_BUILD_LIST $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
)
elif [ "$MACHINE" = "kokkos-dev" ]; then
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-modules-init.sh"
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh"
eval "$MODULE_ENVIRONMENT"

module load sems-cmake/3.17.1
BASE_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA9_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/6.1.0"
CUDA10_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.3.0"
CUDA11_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/9.2.0"
CLANG7_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-cuda/9.2"
module load sems-archive-cmake/3.17.1
BASE_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA9_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/6.1.0"
CUDA10_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/7.3.0"
CUDA11_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/9.2.0"
CLANG7_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-cuda/9.2"
SKIP_HWLOC=True

if [ -z "$ARCH_FLAG" ]; then
Expand Down Expand Up @@ -772,26 +772,26 @@ elif [ "$MACHINE" = "blake" ]; then
fi
SPACK_HOST_ARCH="+skx"
elif [ "$MACHINE" = "apollo" ]; then
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-modules-init.sh ; module use /home/projects/modulefiles/local/x86-64"
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh ; module use /home/projects/modulefiles/local/x86-64"
eval "$MODULE_ENVIRONMENT"

module load sems-git
module load sems-tex
module load sems-cmake/3.17.1
module load sems-gdb
module load sems-archive-git
module load sems-archive-tex
module load sems-archive-cmake/3.17.1
module load sems-archive-gdb
module load binutils

SKIP_HWLOC=True

BASE_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA9_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
CUDA10_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
CUDA101_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.3.0"
BASE_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>"
CUDA9_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/5.3.0"
CUDA10_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/5.3.0"
CUDA101_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/7.3.0"

CLANG_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.0.69"
NVCC_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
# HPX_MODULE_LIST="sems-env,sems-cmake/3.17.1,hpx/1.2.1,sems-gcc/6.1.0,binutils"
# HPX3_MODULE_LIST="sems-env,sems-cmake/3.17.1,compilers/hpx/1.3.0,sems-gcc/6.1.0,binutils"
CLANG_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.0.69"
NVCC_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/5.3.0"
# HPX_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,hpx/1.2.1,sems-archive-gcc/6.1.0,binutils"
# HPX3_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,compilers/hpx/1.3.0,sems-archive-gcc/6.1.0,binutils"

BUILD_LIST_CUDA_NVCC="Cuda_Serial,Cuda_OpenMP"
BUILD_LIST_CUDA_CLANG="Cuda_Serial,Cuda_Pthread"
Expand Down Expand Up @@ -825,25 +825,25 @@ elif [ "$MACHINE" = "apollo" ]; then
SPACK_CUDA_ARCH="+volta70"
SPACK_CUDA_HOST_COMPILER="%gcc@6.1.0"
elif [ "$MACHINE" = "kokkos-dev-2" ]; then
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-modules-init.sh ; module use /home/projects/x86-64/modulefiles/local"
MODULE_ENVIRONMENT="source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh ; module use /home/projects/x86-64/modulefiles/local"
eval "$MODULE_ENVIRONMENT"
module load sems-env
module load sems-archive-env

module load sems-git
module load sems-tex
module load sems-cmake/3.17.1
module load sems-gdb
module load sems-archive-git
module load sems-archive-tex
module load sems-archive-cmake/3.17.1
module load sems-archive-gdb

SKIP_HWLOC=True

BASE_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
GCC91_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>"
NVCC_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.3.0"
NVCC_SEMSMODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.3.0"
NVCC11_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/9.2.0"
BASE_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>"
GCC91_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>"
NVCC_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/7.3.0"
NVCC_SEMSMODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/7.3.0"
NVCC11_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/9.2.0"

CLANG_MODULE_LIST="sems-env,sems-cmake/3.17.1,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/6.1.0"
CLANG8_MODULE_LIST="sems-env,sems-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/10.0"
CLANG_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,sems-archive-<COMPILER_NAME>/<COMPILER_VERSION>,sems-archive-gcc/6.1.0"
CLANG8_MODULE_LIST="sems-archive-env,sems-archive-cmake/3.17.1,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/10.0"

BUILD_LIST_CUDA_NVCC="Cuda_Serial,Cuda_Pthread"
BUILD_LIST_CUDA_CLANG="Cuda_Serial,Cuda_OpenMP"
Expand Down
6 changes: 3 additions & 3 deletions scripts/update_lib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ local compiler_input="$2"
check_sems_intel() {
ICPCVER="$(icpc --version | grep icpc | cut -d ' ' -f 3)"
if [[ "${ICPCVER}" = 17.* ]]; then
module swap sems-gcc/4.9.3 sems-gcc/6.4.0
module swap sems-archive-gcc/4.9.3 sems-archive-gcc/6.4.0
module list
fi
if [[ "${ICPCVER}" = 19.* ]]; then
# Newer gcc needed for c++ standard beyond c++14
module swap sems-gcc/6.1.0 sems-gcc/7.2.0
module swap sems-archive-gcc/6.1.0 sems-archive-gcc/7.2.0
module list
fi
}
Expand All @@ -20,7 +20,7 @@ check_sems_clang() {
CLANGVER=$(clang --version | grep "clang version" | cut -d " " -f 3)
if [[ "${CLANGVER}" = 9.* ]] || [[ "${CLANGVER}" = 10.* ]]; then
# Newer gcc needed for c++ standard beyond c++14
module swap sems-gcc/5.3.0 sems-gcc/8.3.0
module swap sems-archive-gcc/5.3.0 sems-archive-gcc/8.3.0
module list
fi
}
Expand Down

0 comments on commit 598ac78

Please sign in to comment.