diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd4adb4dd9..6e1372cea4 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/pySDC/projects/GPU/etc/venv_booster/modules.sh b/pySDC/projects/GPU/etc/venv_booster/modules.sh index b8a11a925e..740f8d88e6 100644 --- a/pySDC/projects/GPU/etc/venv_booster/modules.sh +++ b/pySDC/projects/GPU/etc/venv_booster/modules.sh @@ -1,5 +1,5 @@ module --force purge -module load Stages/2024 +module load Stages/2025 module load GCC module load ParaStationMPI module load NCCL diff --git a/pySDC/projects/GPU/etc/venv_booster/setup.sh b/pySDC/projects/GPU/etc/venv_booster/setup.sh index 1e0644490c..7dba80b61c 100755 --- a/pySDC/projects/GPU/etc/venv_booster/setup.sh +++ b/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/ diff --git a/pySDC/projects/GPU/etc/venv_jusuf/modules.sh b/pySDC/projects/GPU/etc/venv_jusuf/modules.sh index 5d3e339756..f6f93f8ede 100644 --- a/pySDC/projects/GPU/etc/venv_jusuf/modules.sh +++ b/pySDC/projects/GPU/etc/venv_jusuf/modules.sh @@ -1,5 +1,5 @@ module --force purge -module load Stages/2024 +module load Stages/2025 module load GCC module load ParaStationMPI # module load NCCL diff --git a/pySDC/projects/GPU/etc/venv_jusuf/setup.sh b/pySDC/projects/GPU/etc/venv_jusuf/setup.sh index 40224178d7..1f8e774b45 100755 --- a/pySDC/projects/GPU/etc/venv_jusuf/setup.sh +++ b/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/ diff --git a/pySDC/projects/Resilience/venv/modules.sh b/pySDC/projects/Resilience/venv/modules.sh index 07e78de848..cc7e37b788 100644 --- a/pySDC/projects/Resilience/venv/modules.sh +++ b/pySDC/projects/Resilience/venv/modules.sh @@ -1,5 +1,5 @@ module --force purge -module load Stages/2024 +module load Stages/2025 module load GCC module load OpenMPI module load FFTW diff --git a/pySDC/projects/Resilience/venv/setup.sh b/pySDC/projects/Resilience/venv/setup.sh index b7d606ebf4..429f7d6d46 100755 --- a/pySDC/projects/Resilience/venv/setup.sh +++ b/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/