From 1a581f1b9a7f38819fa0beae188dfc3cdce295d5 Mon Sep 17 00:00:00 2001
From: papeleux <L.Papeleux@ULiege.be>
Date: Wed, 23 Oct 2024 15:25:07 +0200
Subject: [PATCH] config for OneApi2024

---
 cfg/warson/intel.bashrc            | 5 ++---
 cfg/warson/intel.profile           | 9 +++------
 cfg/warson/intel2023/intel.bashrc  | 8 --------
 cfg/warson/intel2023/intel.profile | 8 --------
 cfg/warson/intel2023/mumps.profile | 3 ---
 cfg/warson/mumps.profile           | 6 +++---
 6 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 cfg/warson/intel2023/intel.bashrc
 delete mode 100644 cfg/warson/intel2023/intel.profile
 delete mode 100644 cfg/warson/intel2023/mumps.profile

diff --git a/cfg/warson/intel.bashrc b/cfg/warson/intel.bashrc
index 8560647..d9b8d9f 100644
--- a/cfg/warson/intel.bashrc
+++ b/cfg/warson/intel.bashrc
@@ -3,7 +3,6 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-    . /opt/intel2019/mkl/bin/mklvars.sh intel64
-    . /opt/intel2019/tbb/bin/tbbvars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi
-export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel.profile b/cfg/warson/intel.profile
index 9862a22..5ae6ec0 100644
--- a/cfg/warson/intel.profile
+++ b/cfg/warson/intel.profile
@@ -2,10 +2,7 @@
 #
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
-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
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi
-export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel2023/intel.bashrc b/cfg/warson/intel2023/intel.bashrc
deleted file mode 100644
index 0c51365..0000000
--- a/cfg/warson/intel2023/intel.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64
-     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
-fi
diff --git a/cfg/warson/intel2023/intel.profile b/cfg/warson/intel2023/intel.profile
deleted file mode 100644
index 7325e0c..0000000
--- a/cfg/warson/intel2023/intel.profile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64     
-     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
-fi
diff --git a/cfg/warson/intel2023/mumps.profile b/cfg/warson/intel2023/mumps.profile
deleted file mode 100644
index 2e804bb..0000000
--- a/cfg/warson/intel2023/mumps.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-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"
diff --git a/cfg/warson/mumps.profile b/cfg/warson/mumps.profile
index add06f6..2e804bb 100644
--- a/cfg/warson/mumps.profile
+++ b/cfg/warson/mumps.profile
@@ -1,3 +1,3 @@
-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"
+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"
-- 
GitLab