diff --git a/cfg/warson/intel.bashrc b/cfg/warson/intel.bashrc index 8560647907b75eac876295a514a4180e53d41373..d9b8d9fe00afca577c2c4fd17236e23f324d85de 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 9862a22596eccb6f66140ff1a836d72f97fa7723..5ae6ec08287093508e3038ddfbd3a1441075c0a6 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 0c51365894a0ce78bc678d0316d0c4a27041e702..0000000000000000000000000000000000000000 --- 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 7325e0c6ef3cbf207da1cc4bbbfcdc9346f42451..0000000000000000000000000000000000000000 --- 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 2e804bb9f82fb1ae0f7370e89dd2812d09ffa170..0000000000000000000000000000000000000000 --- 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 add06f65076ac54782c9d092cd63351345b99367..2e804bb9f82fb1ae0f7370e89dd2812d09ffa170 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"