Merge commit 'c7d3542c' into TEMPORARY_MERGE_PR_544

.gitlab-ci.yml

@@ -27,23 +27,22 @@ prepare_JUWELS:
     - shell
   script:
     - mkdir -p benchmarks
-    - module --force purge
-    - module load Stages/2024
+    - module purge
     - module load GCC
     - module load OpenMPI
     - module load FFTW
     - module load mpi4py
-    - module load SciPy-Stack
     - module load CuPy
     - jutil env activate -p ${JUWELS_PROJECT}
-    - python -m venv --clear $SCRATCH/.venv/pySDC
+    - rm -r $SCRATCH/.venv/pySDC || echo "venv did not exist"
+    - python -m venv $SCRATCH/.venv/pySDC
     - source $SCRATCH/.venv/pySDC/bin/activate
     - pip install -e .
     - pip install pytest-benchmark coverage
     - git submodule add -f https://github.com/brownbaerchen/mpi4py-fft.git
     - cd mpi4py-fft
     - git checkout cupy_implementation
-    - FFTW_LIBRARY_DIR="/p/software/juwels/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" pip install --force-reinstall .
+    - FFTW_LIBRARY_DIR="/p/software/juwels/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64" python -m pip install --no-deps --force-reinstall -e .
     - cd ../
 
 
@@ -77,8 +76,7 @@ test_JUWELS:
       - sbatch.out
   before_script:
     - mkdir -p benchmarks
-    - module --force purge
-    - module load Stages/2024
+    - module purge
     - module load GCC
     - module load OpenMPI
     - module load FFTW

pySDC/projects/GPU/etc/venv_booster/modules.sh

 module --force purge
-module load Stages/2024
+module load Stages/2025
 module load GCC
 module load ParaStationMPI
 module load NCCL

pySDC/projects/GPU/etc/venv_booster/setup.sh

@@ -12,9 +12,9 @@ python3 -m venv --prompt "$ENV_NAME" --system-site-packages "${ENV_DIR}"
 
 source "${ABSOLUTE_PATH}"/activate.sh
 
-# FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
-# FFTW_LIBRARY_DIR="/p/software/juwels/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64/" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
-FFTW_LIBRARY_DIR="/p/software/juwelsbooster/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64/" python3 -m pip install -e /p/project1/ccstma/baumann7/mpi4py-fft
+# FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
+# FFTW_LIBRARY_DIR="/p/software/juwels/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64/" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
+FFTW_LIBRARY_DIR="/p/software/juwelsbooster/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64/" python3 -m pip install -e /p/project1/ccstma/baumann7/mpi4py-fft
 python3 -m pip install -e /p/project1/ccstma/baumann7/qmat
 python3 -m pip install -r "${ABSOLUTE_PATH}"/requirements.txt
 python3 -m pip install -e /p/project1/ccstma/baumann7/pySDC/

pySDC/projects/GPU/etc/venv_jusuf/modules.sh

 module --force purge
-module load Stages/2024
+module load Stages/2025
 module load GCC
 module load ParaStationMPI
 # module load NCCL

pySDC/projects/GPU/etc/venv_jusuf/setup.sh

@@ -12,7 +12,7 @@ python3 -m venv --prompt "$ENV_NAME" --system-site-packages "${ENV_DIR}"
 
 source "${ABSOLUTE_PATH}"/activate.sh
 
-FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
+FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64" python3 -m pip install -e /p/project/ccstma/baumann7/mpi4py-fft
 python3 -m pip install -e /p/project1/ccstma/baumann7/qmat
 python3 -m pip install -r "${ABSOLUTE_PATH}"/requirements.txt
 python3 -m pip install -e /p/project1/ccstma/baumann7/pySDC/

pySDC/projects/Resilience/venv/modules.sh

 module --force purge
-module load Stages/2024
+module load Stages/2025
 module load GCC
 module load OpenMPI
 module load FFTW

pySDC/projects/Resilience/venv/setup.sh

@@ -12,7 +12,7 @@ python3 -m venv --prompt "$ENV_NAME" --system-site-packages "${ENV_DIR}"
 
 source "${ABSOLUTE_PATH}"/activate.sh
 
-FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" python3 -m pip install mpi4py-fft
+FFTW_LIBRARY_DIR="/p/software/jusuf/stages/2025/software/FFTW/3.3.10-GCC-13.3.0/lib64" python3 -m pip install mpi4py-fft
 python3 -m pip install --upgrade -r "${ABSOLUTE_PATH}"/requirements.txt
 python3 -m pip install --upgrade -e /p/project/ccstma/baumann7/pySDC/