update nightly scripts

This commit is contained in:
Paul Kent 2020-05-22 14:49:51 -04:00
parent 2c199d008b
commit 5f90d8f928
3 changed files with 23 additions and 8 deletions

View File

@ -39,7 +39,7 @@ case "$plat" in
GenuineIntel )
ourplatform=Intel
;;
AuthenticaAMD )
AuthenticAMD )
ourplatform=AMD
;;
* )
@ -57,14 +57,14 @@ echo --- Host is $ourhostname
case "$ourhostname" in
sulfur )
if [[ $jobtype == "nightly" ]]; then
buildsys="build_intel2020_nompi build_intel2020 build_intel2020_complex build_intel2020_mixed build_intel2020_complex_mixed build_intel2020_aos build_gccnew_nompi_mkl build_gccold_nompi_mkl build_clangnew_nompi_mkl build_clangold_nompi_mkl build_gccnew_nompi build_clangnew_nompi build_gccnew_mkl build_gccnew_mkl_complex build_clangnew_mkl build_clangnew_mkl_complex build_clangnew_mkl_mixed"
buildsys="build_intel2020_nompi build_intel2020 build_intel2020_complex build_intel2020_mixed build_intel2020_complex_mixed build_gccnew_nompi_mkl build_gccold_nompi_mkl build_clangnew_nompi_mkl build_clangold_nompi_mkl build_gccnew_nompi build_clangnew_nompi build_gccnew_mkl build_gccnew_mkl_complex build_clangnew_mkl build_clangnew_mkl_complex build_clangnew_mkl_mixed build_gcccuda build_gcccuda_complex build_gcccuda_full build_pgi2019_nompi"
else
buildsys="build_gccnew_mkl_nompi build_clangnew_mkl_nompi build_intel2020_nompi build_intel2020 build_intel2020_complex build_intel2020_mixed build_intel2020_complex_mixed build_intel2020_aos"
buildsys="build_gccnew_mkl_nompi build_clangnew_mkl_nompi build_intel2020_nompi build_intel2020 build_intel2020_complex build_intel2020_mixed build_intel2020_complex_mixed build_gcccuda build_gcccuda_complex build_pgi2019_nompi"
fi
;;
nitrogen )
if [[ $jobtype == "nightly" ]]; then
buildsys="build_gccnew build_pgi2019_nompi build_gcccuda build_gcccuda_full build_gcccuda_complex build_gccnew_complex build_gccnew_nompi build_gccnew_nompi_complex build_clangnew build_clangnew_complex build_clangnew_mixed build_clangnew_complex_mixed build_clangnew_aos build_clangnew_complex_aos"
buildsys="build_gccnew build_pgi2019_nompi build_gcccuda build_gcccuda_full build_gcccuda_complex build_gccnew_complex build_gccnew_nompi build_gccnew_nompi_complex build_clangnew build_clangnew_complex build_clangnew_mixed build_clangnew_complex_mixed"
else
buildsys="build_gccnew build_pgi2019_nompi build_gcccuda build_gcccuda_complex build_gccnew_complex build_clangnew"
fi
@ -102,8 +102,10 @@ export QMC_DATA=/scratch/pk7/QMC_DATA # Route to directory containing performanc
# CUDA 10 setup
export CUDAVER=10.2
export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/cuda-${CUDAVER}/bin/:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
export LD_LIBRARY_PATH=/usr/local/cuda-${CUDAVER}/lib64
#export PATH=/opt/local/bin:/opt/local/sbin:/usr/local/cuda-${CUDAVER}/bin/:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
export PATH=/usr/local/cuda-${CUDAVER}/bin/:${PATH}
#export LD_LIBRARY_PATH=/usr/local/cuda-${CUDAVER}/lib64
export LD_LIBRARY_PATH=/usr/local/cuda-${CUDAVER}/lib64:${LD_LIBRARY_PATH}
# Specify GPUs for testing. Obtain device IDs via "nvidia-smi -L"
#export CUDA_VISIBLE_DEVICES=
@ -600,6 +602,8 @@ fi
if [[ $sys == *"aos"* ]]; then
QMCPACK_TEST_SUBMIT_NAME=${QMCPACK_TEST_SUBMIT_NAME}-AoS
CTCFG="$CTCFG -DENABLE_SOA=0"
echo "*** ERROR: AoS Builds are deprecated as of 2020-05-19"
exit 1
else
CTCFG="$CTCFG -DENABLE_SOA=1"
fi

View File

@ -21,7 +21,7 @@ case "$plat" in
GenuineIntel )
ourplatform=Intel
;;
AuthenticaAMD )
AuthenticAMD )
ourplatform=AMD
;;
* )
@ -169,6 +169,11 @@ spack load gcc@${gcc_vintel}
spack compiler find
spack unload gcc@${gcc_vintel}
fi
echo --- gcc@${gcc_vpgi}
spack install gcc@${gcc_vpgi}
spack load gcc@${gcc_vpgi}
spack compiler find
spack unload gcc@${gcc_vpgi}
echo --- llvm@${llvm_vnew}
spack install llvm@${llvm_vnew}
spack load llvm@${llvm_vnew}
@ -231,5 +236,10 @@ spack activate py-h5py%gcc@${gcc_vold}
spack activate py-pandas%gcc@${gcc_vold}
spack activate py-lxml%gcc@${gcc_vold}
spack unload python
echo --- PGI setup reminder
echo "To configure the PGI compilers with one of the newly installed C++ libraries:"
echo "spack load gcc@${gcc_vpgi} # For example"
echo "cd /opt/pgi/linux86-64/19.10/bin"
echo "sudo ./makelocalrc -x /opt/pgi/linux86-64/19.10/ -gcc `which gcc` -gpp `which g++` -g77 `which gfortran`"
echo "gcc_vpgi is set to" ${gcc_vpgi}
echo --- FINISH setup script `date`

View File

@ -14,6 +14,7 @@ gcc_vold=7.3.0 # 2018-01-25
#gcc_vcuda=8.2.1 # For CUDA 10.2 compatibility https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html
gcc_vcuda=8.3.0 # Not officially supported with RHEL8.1 but 8.2.1 is not available in spack
gcc_vintel=8.3.0 # Compiler for C++ library used by Intel compiler
gcc_vpgi=8.3.0 # Use makelocalrc to configure PGI with this compiler
# LLVM
# Zen2 scheduling optimizations are only in LLVM 10+