From 604f64393e5d3a5a57cbb1b2b81ee73d5c08e89e Mon Sep 17 00:00:00 2001
From: papeleux <L.Papeleux@ULiege.be>
Date: Thu, 24 Oct 2024 12:01:22 +0200
Subject: [PATCH] fix oneApi default configuration
---
cfg/clifton/oneApi.bashrc | 4 ----
cfg/clifton/oneApi.profile | 1 -
cfg/warson/intel.bashrc | 5 +++--
cfg/warson/intel.profile | 9 ++++++---
cfg/warson/mumps.profile | 6 +++---
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/cfg/clifton/oneApi.bashrc b/cfg/clifton/oneApi.bashrc
index b87d57a..713bc53 100644
--- a/cfg/clifton/oneApi.bashrc
+++ b/cfg/clifton/oneApi.bashrc
@@ -8,8 +8,4 @@ if [ -d /opt/intel ] ; then
. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
- #. /opt/intel/oneapi/tbb/2021.6.0/env/vars.sh intel64
- #. /opt/intel/oneapi/mkl/2022.1.0/env/vars.sh intel64
- #. /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh intel64
-
fi
diff --git a/cfg/clifton/oneApi.profile b/cfg/clifton/oneApi.profile
index a3b3939..0439c8e 100644
--- a/cfg/clifton/oneApi.profile
+++ b/cfg/clifton/oneApi.profile
@@ -7,5 +7,4 @@ if [ -d /opt/intel ] ; then
. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
-
fi
diff --git a/cfg/warson/intel.bashrc b/cfg/warson/intel.bashrc
index d9b8d9f..8560647 100644
--- a/cfg/warson/intel.bashrc
+++ b/cfg/warson/intel.bashrc
@@ -3,6 +3,7 @@
# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
if [ -d /opt/intel ] ; then
- . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
- . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+ . /opt/intel2019/mkl/bin/mklvars.sh intel64
+ . /opt/intel2019/tbb/bin/tbbvars.sh intel64
fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel.profile b/cfg/warson/intel.profile
index 5ae6ec0..9862a22 100644
--- a/cfg/warson/intel.profile
+++ b/cfg/warson/intel.profile
@@ -2,7 +2,10 @@
#
# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-if [ -d /opt/intel ] ; then
- . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
- . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+if [ -n "$BASH_VERSION" ]; then
+ if [ -d /opt/intel ] ; then
+ . /opt/intel2019/mkl/bin/mklvars.sh intel64
+ . /opt/intel2019/tbb/bin/tbbvars.sh intel64
+ fi
fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/mumps.profile b/cfg/warson/mumps.profile
index 2e804bb..add06f6 100644
--- a/cfg/warson/mumps.profile
+++ b/cfg/warson/mumps.profile
@@ -1,3 +1,3 @@
-add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0/lib"
-add2env LIB "/opt/mumps-4.10.0/lib"
-add2env INCLUDE "/opt/mumps-4.10.0/include"
+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0-intel2019/lib"
+add2env LIB "/opt/mumps-4.10.0-intel2019/lib"
+add2env INCLUDE "/opt/mumps-4.10.0-intel2019/include"
--
GitLab