From b01deee86428d341927200247bb842eed9f7a215 Mon Sep 17 00:00:00 2001
From: papeleux <L.Papeleux@ULiege.be>
Date: Fri, 8 Mar 2024 17:43:01 +0100
Subject: [PATCH] rename config files for flexibility
---
cfg/warson/intel.bashrc | 9 +++++++++
cfg/warson/intel.profile | 11 +++++++++++
cfg/warson/intel2019/intel.bashrc | 9 +++++++++
cfg/warson/intel2019/intel.profile | 11 +++++++++++
cfg/warson/intel2019/mumps.profile | 3 +++
cfg/warson/intel2023/intel.bashrc | 8 ++++++++
cfg/warson/intel2023/intel.profile | 8 ++++++++
cfg/warson/intel2023/mumps.profile | 3 +++
cfg/warson/{oneApi.bashrc => intel2024/intel.bashrc} | 1 -
.../{oneApi.profile => intel2024/intel.profile} | 2 --
cfg/warson/intel2024/mumps.profile | 3 +++
cfg/warson/mumps.profile | 6 +++---
12 files changed, 68 insertions(+), 6 deletions(-)
create mode 100644 cfg/warson/intel.bashrc
create mode 100644 cfg/warson/intel.profile
create mode 100644 cfg/warson/intel2019/intel.bashrc
create mode 100644 cfg/warson/intel2019/intel.profile
create mode 100644 cfg/warson/intel2019/mumps.profile
create mode 100644 cfg/warson/intel2023/intel.bashrc
create mode 100644 cfg/warson/intel2023/intel.profile
create mode 100644 cfg/warson/intel2023/mumps.profile
rename cfg/warson/{oneApi.bashrc => intel2024/intel.bashrc} (78%)
rename cfg/warson/{oneApi.profile => intel2024/intel.profile} (68%)
create mode 100644 cfg/warson/intel2024/mumps.profile
diff --git a/cfg/warson/intel.bashrc b/cfg/warson/intel.bashrc
new file mode 100644
index 0000000..8560647
--- /dev/null
+++ b/cfg/warson/intel.bashrc
@@ -0,0 +1,9 @@
+# Intel compiler and/or TBB/MKL
+#
+# 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
+fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel.profile b/cfg/warson/intel.profile
new file mode 100644
index 0000000..9862a22
--- /dev/null
+++ b/cfg/warson/intel.profile
@@ -0,0 +1,11 @@
+# Intel compiler and/or TBB/MKL
+#
+# 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
+fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel2019/intel.bashrc b/cfg/warson/intel2019/intel.bashrc
new file mode 100644
index 0000000..8560647
--- /dev/null
+++ b/cfg/warson/intel2019/intel.bashrc
@@ -0,0 +1,9 @@
+# Intel compiler and/or TBB/MKL
+#
+# 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
+fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel2019/intel.profile b/cfg/warson/intel2019/intel.profile
new file mode 100644
index 0000000..9862a22
--- /dev/null
+++ b/cfg/warson/intel2019/intel.profile
@@ -0,0 +1,11 @@
+# Intel compiler and/or TBB/MKL
+#
+# 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
+fi
+export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intel2019/mumps.profile b/cfg/warson/intel2019/mumps.profile
new file mode 100644
index 0000000..add06f6
--- /dev/null
+++ b/cfg/warson/intel2019/mumps.profile
@@ -0,0 +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"
diff --git a/cfg/warson/intel2023/intel.bashrc b/cfg/warson/intel2023/intel.bashrc
new file mode 100644
index 0000000..0c51365
--- /dev/null
+++ b/cfg/warson/intel2023/intel.bashrc
@@ -0,0 +1,8 @@
+# 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
new file mode 100644
index 0000000..7325e0c
--- /dev/null
+++ b/cfg/warson/intel2023/intel.profile
@@ -0,0 +1,8 @@
+# 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
new file mode 100644
index 0000000..2e804bb
--- /dev/null
+++ b/cfg/warson/intel2023/mumps.profile
@@ -0,0 +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"
diff --git a/cfg/warson/oneApi.bashrc b/cfg/warson/intel2024/intel.bashrc
similarity index 78%
rename from cfg/warson/oneApi.bashrc
rename to cfg/warson/intel2024/intel.bashrc
index 0e8e36f..d9b8d9f 100644
--- a/cfg/warson/oneApi.bashrc
+++ b/cfg/warson/intel2024/intel.bashrc
@@ -5,5 +5,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/oneApi.profile b/cfg/warson/intel2024/intel.profile
similarity index 68%
rename from cfg/warson/oneApi.profile
rename to cfg/warson/intel2024/intel.profile
index 0272e8b..5ae6ec0 100644
--- a/cfg/warson/oneApi.profile
+++ b/cfg/warson/intel2024/intel.profile
@@ -3,8 +3,6 @@
# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
if [ -d /opt/intel ] ; then
- #. /opt/intel/oneapi/setvars.sh intel64
. /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/intel2024/mumps.profile b/cfg/warson/intel2024/mumps.profile
new file mode 100644
index 0000000..2e804bb
--- /dev/null
+++ b/cfg/warson/intel2024/mumps.profile
@@ -0,0 +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"
diff --git a/cfg/warson/mumps.profile b/cfg/warson/mumps.profile
index 57e0ada..add06f6 100644
--- a/cfg/warson/mumps.profile
+++ b/cfg/warson/mumps.profile
@@ -1,3 +1,3 @@
-add2env LD_LIBRARY_PATH "/opt/mumps/lib"
-add2env LIB "/opt/mumps/lib"
-add2env INCLUDE "/opt/mumps/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