From b6dbd4ad1772f20f2ac9246762ecf12c21268b47 Mon Sep 17 00:00:00 2001 From: edoapra Date: Mon, 2 Dec 2019 18:34:45 -0800 Subject: [PATCH] back to intel2018 [travis skip] --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f231b2b58b..80f82d1347 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ variables: variables: GIT_CLEAN_FLAGS: -ffdx -e bin -e build -e install script: - - if [ "$FC" == "ifort" ]; then source /opt/intel/inteloneapi/compiler/latest/env/vars.sh intel64; source /opt/intel/inteloneapi/mkl/latest/env/vars.sh intel64 ; source /opt/intel/inteloneapi/mpi/latest/env/vars.sh intel64 ; fi + - if [ "$FC" == "ifort" ]; then source /opt/intel/compilers_and_libraries_2018/linux/bin/compilervars.sh intel64 ; fi - export NWCHEM_TOP=$CI_PROJECT_DIR - if [ "$(lsb_release -i|cut -c 17-)" == "CentOS" ]; then export NWCHEM_TOP=$HOME/$CI_PROJECT_DIR ; fi - if [ "$(lsb_release -i|cut -c 17-)" == "CentOS" ]; then mkdir -p $NWCHEM_TOP/bin/LINUX64 ; scp edo@10.0.2.2:gitlab/nwchem_centos8 $NWCHEM_TOP/bin/LINUX64/nwchem ; fi @@ -75,9 +75,7 @@ variables: .intel_template: &intel_sourcing before_script: - - source /opt/intel/inteloneapi/compiler/latest/env/vars.sh intel64 - - source /opt/intel/inteloneapi/mkl/latest/env/vars.sh intel64 - - source /opt/intel/inteloneapi/mpi/latest/env/vars.sh intel64 + - source /opt/intel/compilers_and_libraries_2018/linux/bin/compilervars.sh intel64 - export NWCHEM_EXECUTABLE=${NWCHEM_TOP}/../binaries/nwchem_intel - export FC=ifort