From 59733e8b159fb812608c7c36bbed560edef1f9fb Mon Sep 17 00:00:00 2001 From: Valentin Clement Date: Wed, 19 Jun 2019 17:18:21 +0200 Subject: [PATCH] Switch test env to prod env --- .../{env_kesch-test.sh => env_kesch-old.sh} | 10 ---------- tools/cscs-scripts/env_kesch.sh | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) rename tools/cscs-scripts/{env_kesch-test.sh => env_kesch-old.sh} (76%) diff --git a/tools/cscs-scripts/env_kesch-test.sh b/tools/cscs-scripts/env_kesch-old.sh similarity index 76% rename from tools/cscs-scripts/env_kesch-test.sh rename to tools/cscs-scripts/env_kesch-old.sh index 086a513f..3e746ae0 100644 --- a/tools/cscs-scripts/env_kesch-test.sh +++ b/tools/cscs-scripts/env_kesch-old.sh @@ -71,11 +71,6 @@ module load cmake/3.9.1 if [ "$FC_COMPILER" = "pgfortran" ]; then -module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles -module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all -module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all -module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all - module load craype-haswell module load craype-accel-nvidia35 module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0 @@ -83,11 +78,6 @@ module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all module load gcc/5.4.0-2.26 elif [ "$FC_COMPILER" = "ftn" ]; then -module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles -module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all -module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all -module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all - module load craype-haswell module load PrgEnv-cray module load craype-accel-nvidia35 diff --git a/tools/cscs-scripts/env_kesch.sh b/tools/cscs-scripts/env_kesch.sh index 3e746ae0..086a513f 100644 --- a/tools/cscs-scripts/env_kesch.sh +++ b/tools/cscs-scripts/env_kesch.sh @@ -71,6 +71,11 @@ module load cmake/3.9.1 if [ "$FC_COMPILER" = "pgfortran" ]; then +module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles +module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all +module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all +module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all + module load craype-haswell module load craype-accel-nvidia35 module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0 @@ -78,6 +83,11 @@ if [ "$FC_COMPILER" = "pgfortran" ]; then module load gcc/5.4.0-2.26 elif [ "$FC_COMPILER" = "ftn" ]; then +module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles +module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all +module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all +module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all + module load craype-haswell module load PrgEnv-cray module load craype-accel-nvidia35