From 71f1145b9f46d53e969dead1f93aa8593b7cf808 Mon Sep 17 00:00:00 2001 From: papeleux <L.Papeleux@ULiege.be> Date: Wed, 31 Jan 2024 15:32:12 +0100 Subject: [PATCH] upgrade warson -> debian 12 --- cfg/warson/cmake.profile | 2 -- cfg/warson/compilers.bashrc | 7 ------- cfg/warson/compilers.profile | 8 -------- cfg/warson/gmsh.profile | 2 ++ cfg/warson/intelCommunity.bashrc | 9 --------- cfg/warson/intelCommunity.profile | 11 ----------- cfg/warson/leanVTK.profile | 1 + cfg/warson/metafor.profile | 1 - cfg/warson/oneApi.bashrc | 9 +++++++++ cfg/warson/oneApi.profile | 10 ++++++++++ 10 files changed, 22 insertions(+), 38 deletions(-) delete mode 100644 cfg/warson/cmake.profile delete mode 100644 cfg/warson/compilers.bashrc delete mode 100644 cfg/warson/compilers.profile delete mode 100644 cfg/warson/intelCommunity.bashrc delete mode 100644 cfg/warson/intelCommunity.profile create mode 100644 cfg/warson/leanVTK.profile delete mode 100644 cfg/warson/metafor.profile create mode 100644 cfg/warson/oneApi.bashrc create mode 100644 cfg/warson/oneApi.profile diff --git a/cfg/warson/cmake.profile b/cfg/warson/cmake.profile deleted file mode 100644 index aa827bc..0000000 --- a/cfg/warson/cmake.profile +++ /dev/null @@ -1,2 +0,0 @@ -# Trilinos requires cmake >= 3.10 -add2env PATH "/opt/cmake/bin" front diff --git a/cfg/warson/compilers.bashrc b/cfg/warson/compilers.bashrc deleted file mode 100644 index 2e502d8..0000000 --- a/cfg/warson/compilers.bashrc +++ /dev/null @@ -1,7 +0,0 @@ -add2env PATH "/opt/gcc-9.4.0/bin" front -add2env LD_LIBRARY_PATH "/opt/gcc-9.4.0/lib64" front -# sinon cmake build avec /usr/bin/c++... -export CC=gcc -export CXX=g++ -export FC=gfortran - diff --git a/cfg/warson/compilers.profile b/cfg/warson/compilers.profile deleted file mode 100644 index 3e1604a..0000000 --- a/cfg/warson/compilers.profile +++ /dev/null @@ -1,8 +0,0 @@ -add2env PATH "/opt/gcc-9.4.0/bin" front -add2env LD_LIBRARY_PATH "/opt/gcc-9.4.0/lib64" front - -# sinon cmake build avec /usr/bin/c++... -export CC=gcc -export CXX=g++ -export FC=gfortran - diff --git a/cfg/warson/gmsh.profile b/cfg/warson/gmsh.profile index 412f3fc..5c49bb8 100644 --- a/cfg/warson/gmsh.profile +++ b/cfg/warson/gmsh.profile @@ -1,3 +1,5 @@ add2env PATH "/opt/gmsh/bin" front +add2env INCLUDE "/opt/gmsh/include" front +add2env LIB "/opt/gmsh/lib" front add2env LD_LIBRARY_PATH "/opt/gmsh/lib" add2env PYTHONPATH "/opt/gmsh/lib" diff --git a/cfg/warson/intelCommunity.bashrc b/cfg/warson/intelCommunity.bashrc deleted file mode 100644 index 06b1982..0000000 --- a/cfg/warson/intelCommunity.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# Intel compiler and/or TBB/MKL -# -# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*") - -if [ -d /opt/intel ] ; then - . /opt/intel/mkl/bin/mklvars.sh intel64 - . /opt/intel/tbb/bin/tbbvars.sh intel64 -fi -export MKL_DEBUG_CPU_TYPE=5 diff --git a/cfg/warson/intelCommunity.profile b/cfg/warson/intelCommunity.profile deleted file mode 100644 index 3e1712b..0000000 --- a/cfg/warson/intelCommunity.profile +++ /dev/null @@ -1,11 +0,0 @@ -# Intel compiler and/or TBB/MKL -# -# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*") - -if [ -n "$BASH_VERSION" ]; then - if [ -d /opt/intel ] ; then - . /opt/intel/mkl/bin/mklvars.sh intel64 - . /opt/intel/tbb/bin/tbbvars.sh intel64 - fi -fi -export MKL_DEBUG_CPU_TYPE=5 diff --git a/cfg/warson/leanVTK.profile b/cfg/warson/leanVTK.profile new file mode 100644 index 0000000..02bfbe9 --- /dev/null +++ b/cfg/warson/leanVTK.profile @@ -0,0 +1 @@ +add2env PATH "/usr/local/lib/LeanVTK-1.0" diff --git a/cfg/warson/metafor.profile b/cfg/warson/metafor.profile deleted file mode 100644 index 3fe8c1e..0000000 --- a/cfg/warson/metafor.profile +++ /dev/null @@ -1 +0,0 @@ -add2env PATH /home/$USER/dev/Metafor_master/oo_metaB/bin diff --git a/cfg/warson/oneApi.bashrc b/cfg/warson/oneApi.bashrc new file mode 100644 index 0000000..0e8e36f --- /dev/null +++ b/cfg/warson/oneApi.bashrc @@ -0,0 +1,9 @@ +# Intel compiler and/or TBB/MKL +# +# 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 +fi diff --git a/cfg/warson/oneApi.profile b/cfg/warson/oneApi.profile new file mode 100644 index 0000000..0272e8b --- /dev/null +++ b/cfg/warson/oneApi.profile @@ -0,0 +1,10 @@ +# Intel compiler and/or TBB/MKL +# +# 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 -- GitLab