From f06536e3a7461a51decdbfb8acf9f01f778faf85 Mon Sep 17 00:00:00 2001 From: Romain Boman <romain.boman@gmail.com> Date: Wed, 23 Aug 2023 13:47:57 +0200 Subject: [PATCH] upgrade to Debian 12 --- cfg/gaston/cmake.profile | 2 -- cfg/gaston/eigen.profile | 1 - cfg/gaston/gcc.profile | 6 ------ cfg/gaston/gmm.profile | 1 - cfg/gaston/intelCommunity.bashrc | 10 ---------- cfg/gaston/intelCommunity.profile | 10 ---------- cfg/gaston/oneApi.bashrc | 9 +++++++++ cfg/gaston/oneApi.profile | 10 ++++++++++ cfg/gaston/python.profile | 3 --- cfg/gaston/swig.profile | 2 -- cfg/gaston/trilinos.profile | 4 ---- cfg/gaston/vtk.profile | 4 ---- 12 files changed, 19 insertions(+), 43 deletions(-) delete mode 100644 cfg/gaston/cmake.profile delete mode 100644 cfg/gaston/eigen.profile delete mode 100644 cfg/gaston/gcc.profile delete mode 100644 cfg/gaston/gmm.profile delete mode 100644 cfg/gaston/intelCommunity.bashrc delete mode 100644 cfg/gaston/intelCommunity.profile create mode 100644 cfg/gaston/oneApi.bashrc create mode 100644 cfg/gaston/oneApi.profile delete mode 100644 cfg/gaston/python.profile delete mode 100644 cfg/gaston/swig.profile delete mode 100644 cfg/gaston/trilinos.profile delete mode 100644 cfg/gaston/vtk.profile diff --git a/cfg/gaston/cmake.profile b/cfg/gaston/cmake.profile deleted file mode 100644 index aa827bc..0000000 --- a/cfg/gaston/cmake.profile +++ /dev/null @@ -1,2 +0,0 @@ -# Trilinos requires cmake >= 3.10 -add2env PATH "/opt/cmake/bin" front diff --git a/cfg/gaston/eigen.profile b/cfg/gaston/eigen.profile deleted file mode 100644 index b0978f2..0000000 --- a/cfg/gaston/eigen.profile +++ /dev/null @@ -1 +0,0 @@ -add2env INCLUDE /opt/eigen/include/eigen3 diff --git a/cfg/gaston/gcc.profile b/cfg/gaston/gcc.profile deleted file mode 100644 index 74e8226..0000000 --- a/cfg/gaston/gcc.profile +++ /dev/null @@ -1,6 +0,0 @@ -add2env PATH "/opt/gcc-10.3.0/bin" front -add2env LD_LIBRARY_PATH "/opt/gcc-10.3.0/lib64" front -export CC=/opt/gcc-10.3.0/bin/gcc -export CXX=/opt/gcc-10.3.0/bin/g++ -export FC=/opt/gcc-10.3.0/bin/gfortran - diff --git a/cfg/gaston/gmm.profile b/cfg/gaston/gmm.profile deleted file mode 100644 index 45f02f9..0000000 --- a/cfg/gaston/gmm.profile +++ /dev/null @@ -1 +0,0 @@ -add2env INCLUDE /opt/gmm diff --git a/cfg/gaston/intelCommunity.bashrc b/cfg/gaston/intelCommunity.bashrc deleted file mode 100644 index 43482b6..0000000 --- a/cfg/gaston/intelCommunity.bashrc +++ /dev/null @@ -1,10 +0,0 @@ -# Intel compiler and/or TBB/MKL -# -# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*") - -if [ -z "$MKLROOT" ]; then - . /opt/intel/mkl/bin/mklvars.sh intel64 -fi -if [ -z "$TBBROOT" ]; then - . /opt/intel/tbb/bin/tbbvars.sh intel64 -fi diff --git a/cfg/gaston/intelCommunity.profile b/cfg/gaston/intelCommunity.profile deleted file mode 100644 index e5d1ff5..0000000 --- a/cfg/gaston/intelCommunity.profile +++ /dev/null @@ -1,10 +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 diff --git a/cfg/gaston/oneApi.bashrc b/cfg/gaston/oneApi.bashrc new file mode 100644 index 0000000..0e8e36f --- /dev/null +++ b/cfg/gaston/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/gaston/oneApi.profile b/cfg/gaston/oneApi.profile new file mode 100644 index 0000000..0272e8b --- /dev/null +++ b/cfg/gaston/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 diff --git a/cfg/gaston/python.profile b/cfg/gaston/python.profile deleted file mode 100644 index e191c02..0000000 --- a/cfg/gaston/python.profile +++ /dev/null @@ -1,3 +0,0 @@ -add2env PATH "/opt/python/bin" front -# added in ld.conf.d (else no way to have it in batch/at) -#add2env LD_LIBRARY_PATH "/opt/python/lib" front diff --git a/cfg/gaston/swig.profile b/cfg/gaston/swig.profile deleted file mode 100644 index 253b9d9..0000000 --- a/cfg/gaston/swig.profile +++ /dev/null @@ -1,2 +0,0 @@ -# Trilinos requires swig >= 3.0.11 -add2env PATH "/opt/swig/bin" front diff --git a/cfg/gaston/trilinos.profile b/cfg/gaston/trilinos.profile deleted file mode 100644 index 42177c7..0000000 --- a/cfg/gaston/trilinos.profile +++ /dev/null @@ -1,4 +0,0 @@ -# Trilinos custom compile localement -# (permet le FIND_PACKAGE(Trilinos) dans CMake) -add2env CMAKE_PREFIX_PATH "/opt/trilinos" front -add2env PYTHONPATH "/opt/trilinos/lib/python3.7/site-packages" front diff --git a/cfg/gaston/vtk.profile b/cfg/gaston/vtk.profile deleted file mode 100644 index b1da9c9..0000000 --- a/cfg/gaston/vtk.profile +++ /dev/null @@ -1,4 +0,0 @@ -add2env LD_LIBRARY_PATH "/opt/vtk/lib/" front -add2env LIB "/opt/vtk/lib/cmake/vtk-7.1" front -add2env PYTHONPATH "/opt/vtk/lib/python3.7/site-packages" front -#add2env INCLUDE "/opt/vtk/include/vtk-7.1" front -- GitLab