From 653cadf55ab2b42aa780f5b8f256f4f9418c9688 Mon Sep 17 00:00:00 2001 From: kliegeois <kimliegeois@ymail.com> Date: Mon, 22 Oct 2018 09:00:52 +0200 Subject: [PATCH] Correction of a bug that prevents from running intel config scripts on treebeard --- cfg/treebeard/compilers.bashrc | 10 +++------- cfg/treebeard/compilers.profile | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cfg/treebeard/compilers.bashrc b/cfg/treebeard/compilers.bashrc index 1a1a80b..bdd2a0a 100644 --- a/cfg/treebeard/compilers.bashrc +++ b/cfg/treebeard/compilers.bashrc @@ -1,9 +1,5 @@ -# Intel compiler and/or TBB/MKL -# -# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*") +# Intel compilers -if [ -z "$MKLROOT" ]; then - if [ -d /opt/intel ] ; then - . /opt/intel/compilers_and_libraries_2019/linux/bin/compilervars.sh intel64 - fi +if [ -d /opt/intel ] ; then + . /opt/intel/compilers_and_libraries_2019/linux/bin/compilervars.sh intel64 fi diff --git a/cfg/treebeard/compilers.profile b/cfg/treebeard/compilers.profile index ca2cbae..7e30288 100644 --- a/cfg/treebeard/compilers.profile +++ b/cfg/treebeard/compilers.profile @@ -1,6 +1,4 @@ -# Intel compiler and/or TBB/MKL -# -# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*") +# Intel compilers if [ -n "$BASH_VERSION" ]; then if [ -d /opt/intel ] ; then -- GitLab