Merge branch 'papeleux' into 'master'

Intel libs under warson & gaston

See merge request am-dept/linuxbin!43

cfg/gaston/oneApi.bashrc

@@ -3,7 +3,8 @@
 # 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/intel/oneapi/compiler/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
+     #. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi

cfg/gaston/oneApi.profile

@@ -3,8 +3,8 @@
 # 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
+     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
+     #. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     #. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi

cfg/warson/intel.bashrc

+# 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

cfg/warson/intel.profile

+# 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

cfg/warson/intel2019/intel.bashrc

+# 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

cfg/warson/intel2019/intel.profile

+# 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

cfg/warson/intel2019/mumps.profile

+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"

cfg/warson/intel2023/intel.bashrc

+# 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

cfg/warson/intel2023/intel.profile

+# 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

cfg/warson/intel2023/mumps.profile

+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"

cfg/warson/oneApi.bashrc → 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

cfg/warson/oneApi.profile → 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

cfg/warson/intel2024/mumps.profile

+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"

cfg/warson/mumps.profile

-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"