From 13e3102335b6a4bc5e3c5a8d7987f0b782d6e200 Mon Sep 17 00:00:00 2001
From: Duncan Meacher <duncan.meacher@ligo.org>
Date: Mon, 9 Apr 2018 07:20:33 -0700
Subject: [PATCH] Makefile.ligosoftware_icc_O2_C02: revert to correct icc
versions as used in testing
---
.../post_O2/optimised/Makefile.ligosoftware_icc_O2_C02 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_O2_C02 b/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_O2_C02
index bce3c031d3..84d6f4c23c 100644
--- a/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_O2_C02
+++ b/gstlal-inspiral/share/post_O2/optimised/Makefile.ligosoftware_icc_O2_C02
@@ -175,11 +175,11 @@ WHITE="${esc}[m"
# Determine cluster
CLUSTER:=$(shell hostname -d)
-ICC_CIT:=/ldcg/intel/2018u2/bin/compilervars.sh
-ICC_LHO:=/ldcg/intel/2018u2/bin/compilervars.sh
-ICC_LLO:=/ldcg/intel/2018u2/bin/compilervars.sh
+ICC_CIT:=/ldcg/intel/2017u2/bin/compilervars.sh
+ICC_LHO:=/ldcg/intel/2017u2/bin/compilervars.sh
+ICC_LLO:=/ldcg/intel/2017u2/bin/compilervars.sh
ICC_UWM:=/opt/intel/2017u4/bin/compilervars.sh
-ICC_ATLAS:=/opt/intel/2018/intel.sh
+ICC_ATLAS:=/opt/intel/2015/intel.sh
ICC_PSU:=/ligo/apps/intel/2017u4/bin/compilervars.sh
all : $(GSTINSPIRAL_TARGET) $(LOGS_DIR)/gstlal.txt
@@ -212,7 +212,7 @@ env.sh :
echo 'LDFLAGS_INTEL="-L$${MKLROOT}/lib/intel64"' >> $@ ; \
elif [[ ${CLUSTER} == *"atlas.local" ]] ; then \
echo "source ${ICC_ATLAS} intel64" >> $@ ; \
- echo 'LDFLAGS_INTEL="-L/opt/intel/2018/lib/intel64 -L/opt/intel/2018/mkl/lib/intel64"' >> $@ ; \
+ echo 'LDFLAGS_INTEL="-L/opt/intel/2015/lib/intel64 -L/opt/intel/2015/mkl/lib/intel64"' >> $@ ; \
fi
@echo 'export LD_LIBRARY_PATH=$${LAL_PATH}/lib:$${LD_LIBRARY_PATH}' >> $@
@echo 'export CC="icc"' >> $@
--
GitLab