From 71618de745272cfc0fbfa9ab4598c761b018e1a7 Mon Sep 17 00:00:00 2001 From: Dominik Thoennes Date: Thu, 13 Jun 2024 09:52:35 +0200 Subject: [PATCH] update lbmpy version --- .gitlab-ci.yml | 863 ++++++++++++------ .../UniformGridCPU/UniformGridCPU.py | 4 +- .../UniformGridGPU/UniformGridGPU.py | 3 +- .../old_ideas/UniformGridGPU.py | 3 +- apps/tutorials/lbm/06_LBBoundaryCondition.cpp | 5 +- src/pe/raytracing/Intersects.h | 5 +- 6 files changed, 602 insertions(+), 281 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b55ace1d..187dd2c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,7 +97,7 @@ stages: icc_2022_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -113,7 +113,7 @@ icc_2022_serial: icc_2022_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" @@ -127,7 +127,7 @@ icc_2022_mpionly: icc_2022_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WARNING_ERROR: "OFF" @@ -137,7 +137,7 @@ icc_2022_hybrid: icc_2022_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -151,7 +151,7 @@ icc_2022_serial_dbg: icc_2022_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -163,7 +163,7 @@ icc_2022_mpionly_dbg: icc_2022_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -174,7 +174,7 @@ icc_2022_hybrid_dbg: icc_2022_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -188,7 +188,7 @@ icc_2022_hybrid_dbg_sp: icx_2023_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -203,7 +203,7 @@ icx_2023_serial: icx_2023_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" @@ -216,7 +216,7 @@ icx_2023_mpionly: icx_2023_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" tags: @@ -225,7 +225,7 @@ icx_2023_hybrid: icx_2023_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -238,7 +238,7 @@ icx_2023_serial_dbg: icx_2023_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -249,7 +249,7 @@ icx_2023_mpionly_dbg: icx_2023_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -259,7 +259,7 @@ icx_2023_hybrid_dbg: icx_2023_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:22 variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -272,14 +272,18 @@ icx_2023_hybrid_dbg_sp: gcc_10_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -287,6 +291,7 @@ gcc_10_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -296,19 +301,24 @@ gcc_10_serial: gcc_10_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -318,18 +328,23 @@ gcc_10_mpionly: gcc_10_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -339,14 +354,18 @@ gcc_10_hybrid: gcc_10_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -355,6 +374,7 @@ gcc_10_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -364,20 +384,25 @@ gcc_10_serial_dbg: gcc_10_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -387,33 +412,42 @@ gcc_10_mpionly_dbg: gcc_10_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker gcc_10_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -422,6 +456,7 @@ gcc_10_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -431,14 +466,18 @@ gcc_10_hybrid_dbg_sp: gcc_11_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -446,6 +485,7 @@ gcc_11_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -455,19 +495,24 @@ gcc_11_serial: gcc_11_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -477,18 +522,23 @@ gcc_11_mpionly: gcc_11_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -498,14 +548,18 @@ gcc_11_hybrid: gcc_11_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -514,6 +568,7 @@ gcc_11_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -523,20 +578,25 @@ gcc_11_serial_dbg: gcc_11_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -546,19 +606,24 @@ gcc_11_mpionly_dbg: gcc_11_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -568,14 +633,18 @@ gcc_11_hybrid_dbg: gcc_11_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -584,6 +653,7 @@ gcc_11_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -593,14 +663,18 @@ gcc_11_hybrid_dbg_sp: gcc_12_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -608,6 +682,7 @@ gcc_12_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -617,19 +692,24 @@ gcc_12_serial: gcc_12_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -639,18 +719,23 @@ gcc_12_mpionly: gcc_12_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -660,14 +745,18 @@ gcc_12_hybrid: gcc_12_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -676,6 +765,7 @@ gcc_12_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -685,20 +775,25 @@ gcc_12_serial_dbg: gcc_12_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -708,19 +803,24 @@ gcc_12_mpionly_dbg: gcc_12_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -730,14 +830,18 @@ gcc_12_hybrid_dbg: gcc_12_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -746,6 +850,7 @@ gcc_12_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -755,14 +860,18 @@ gcc_12_hybrid_dbg_sp: gcc_13_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -770,6 +879,7 @@ gcc_13_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" only: variables: @@ -780,19 +890,24 @@ gcc_13_serial: gcc_13_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" only: variables: @@ -803,19 +918,24 @@ gcc_13_mpionly: gcc_13_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 stage: pretest before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" tags: - cuda11 @@ -823,14 +943,18 @@ gcc_13_hybrid: gcc_13_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -839,6 +963,7 @@ gcc_13_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" tags: - cuda11 @@ -846,20 +971,25 @@ gcc_13_serial_dbg: gcc_13_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" tags: - cuda11 @@ -867,19 +997,24 @@ gcc_13_mpionly_dbg: gcc_13_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" tags: - cuda11 @@ -887,14 +1022,18 @@ gcc_13_hybrid_dbg: gcc_13_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=gcc CXX=g++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -903,6 +1042,7 @@ gcc_13_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT: "ON" tags: - cuda11 @@ -910,14 +1050,18 @@ gcc_13_hybrid_dbg_sp: clang_14_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -925,6 +1069,7 @@ clang_14_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -934,19 +1079,24 @@ clang_14_serial: clang_14_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -956,18 +1106,23 @@ clang_14_mpionly: clang_14_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -977,14 +1132,18 @@ clang_14_hybrid: clang_14_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -993,6 +1152,7 @@ clang_14_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1002,20 +1162,25 @@ clang_14_serial_dbg: clang_14_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1025,33 +1190,42 @@ clang_14_mpionly_dbg: clang_14_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker clang_14_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -1060,6 +1234,7 @@ clang_14_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1069,14 +1244,18 @@ clang_14_hybrid_dbg_sp: clang_15_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1084,6 +1263,7 @@ clang_15_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1093,19 +1273,24 @@ clang_15_serial: clang_15_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1115,18 +1300,23 @@ clang_15_mpionly: clang_15_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1136,14 +1326,18 @@ clang_15_hybrid: clang_15_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1152,6 +1346,7 @@ clang_15_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1161,20 +1356,25 @@ clang_15_serial_dbg: clang_15_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1184,19 +1384,24 @@ clang_15_mpionly_dbg: clang_15_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1206,14 +1411,18 @@ clang_15_hybrid_dbg: clang_15_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -1222,6 +1431,7 @@ clang_15_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1231,14 +1441,18 @@ clang_15_hybrid_dbg_sp: clang_16_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1246,6 +1460,7 @@ clang_16_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1255,19 +1470,24 @@ clang_16_serial: clang_16_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1277,18 +1497,23 @@ clang_16_mpionly: clang_16_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1298,14 +1523,18 @@ clang_16_hybrid: clang_16_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1314,6 +1543,7 @@ clang_16_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1323,20 +1553,25 @@ clang_16_serial_dbg: clang_16_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1346,19 +1581,24 @@ clang_16_mpionly_dbg: clang_16_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1368,14 +1608,18 @@ clang_16_hybrid_dbg: clang_16_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -1384,6 +1628,7 @@ clang_16_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1393,14 +1638,18 @@ clang_16_hybrid_dbg_sp: clang_17_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1408,6 +1657,7 @@ clang_17_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1417,19 +1667,24 @@ clang_17_serial: clang_17_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1439,32 +1694,41 @@ clang_17_mpionly: clang_17_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker clang_17_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1473,60 +1737,75 @@ clang_17_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker clang_17_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker clang_17_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker clang_17_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:22 stage: pretest before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -1535,20 +1814,25 @@ clang_17_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker aocc_4_serial: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1556,6 +1840,7 @@ aocc_4_serial: WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1565,19 +1850,24 @@ aocc_4_serial: aocc_4_mpionly: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" only: variables: - $ENABLE_NIGHTLY_BUILDS @@ -1587,32 +1877,41 @@ aocc_4_mpionly: aocc_4_hybrid: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker aocc_4_serial_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_MPI: "OFF" @@ -1621,59 +1920,74 @@ aocc_4_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker aocc_4_mpionly_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker aocc_4_hybrid_dbg: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker aocc_4_hybrid_dbg_sp: extends: .build_template - image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21 + image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:22 before_script: - - pip3 install lbmpy==1.3.3 jinja2 pytest + - python3 -m venv ci-venv + - source ci-venv/bin/activate + - python3 -m pip install lbmpy==1.3.4 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - - pip3 list + - python3 -m pip list + - deactivate + - python3 -m pip install numpy - cd .. - - CC=gcc CXX=g++ pip3 install cupy-cuda11x + - CC=clang CXX=clang++ ci-venv/bin/python -m pip install cupy-cuda11x variables: WALBERLA_BUILD_WITH_CUDA: "ON" CMAKE_BUILD_TYPE: "DebugOptimized" @@ -1682,6 +1996,7 @@ aocc_4_hybrid_dbg_sp: WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" + Python_ROOT_DIR: "./ci-venv" tags: - cuda11 - docker @@ -1826,8 +2141,8 @@ coverage: mac_Serial_Dbg: extends: .mac_build_template before_script: - - pip3 install pystencils==1.3.3 - - pip3 install lbmpy==1.3.3 + - pip3 install pystencils==1.3.4 + - pip3 install lbmpy==1.3.4 variables: CMAKE_BUILD_TYPE: "DebugOptimized" CTEST_EXCLUDE_LABELS: "longrun" @@ -1839,8 +2154,8 @@ mac_Serial_Dbg: mac_Serial: extends: .mac_build_template before_script: - - pip3 install pystencils==1.3.3 - - pip3 install lbmpy==1.3.3 + - pip3 install pystencils==1.3.4 + - pip3 install lbmpy==1.3.4 variables: CMAKE_BUILD_TYPE: "Release" CTEST_EXCLUDE_LABELS: "longrun" @@ -1852,8 +2167,8 @@ mac_Serial: mac_MpiOnly_Dbg: extends: .mac_build_template before_script: - - pip3 install pystencils==1.3.3 - - pip3 install lbmpy==1.3.3 + - pip3 install pystencils==1.3.4 + - pip3 install lbmpy==1.3.4 variables: CMAKE_BUILD_TYPE: "DebugOptimized" CTEST_EXCLUDE_LABELS: "longrun" @@ -1866,8 +2181,8 @@ mac_MpiOnly_Dbg: mac_MpiOnly: extends: .mac_build_template before_script: - - pip3 install pystencils==1.3.3 - - pip3 install lbmpy==1.3.3 + - pip3 install pystencils==1.3.4 + - pip3 install lbmpy==1.3.4 variables: CMAKE_BUILD_TYPE: "Release" CTEST_EXCLUDE_LABELS: "longrun" diff --git a/apps/benchmarks/UniformGridCPU/UniformGridCPU.py b/apps/benchmarks/UniformGridCPU/UniformGridCPU.py index 676d5f0f..5a600ead 100644 --- a/apps/benchmarks/UniformGridCPU/UniformGridCPU.py +++ b/apps/benchmarks/UniformGridCPU/UniformGridCPU.py @@ -10,7 +10,7 @@ from lbmpy.advanced_streaming.utility import streaming_patterns, get_accessor, Timestep from lbmpy.boundaries import NoSlip, UBB from lbmpy.creationfunctions import LBMConfig, LBMOptimisation, LBStencil, create_lb_collision_rule -from lbmpy.enums import Method, Stencil +from lbmpy.enums import Method, Stencil, SubgridScaleModel from lbmpy.fieldaccess import CollideOnlyInplaceAccessor from lbmpy.moments import get_default_moment_set_for_stencil from lbmpy.updatekernels import create_stream_only_kernel @@ -73,7 +73,7 @@ }, 'smagorinsky': { 'method': Method.SRT, - 'smagorinsky': False, + 'subgrid_scale_model': SubgridScaleModel.SMAGORINSKY, 'relaxation_rate': omega, } } diff --git a/apps/benchmarks/UniformGridGPU/UniformGridGPU.py b/apps/benchmarks/UniformGridGPU/UniformGridGPU.py index 6d7d7648..09235c43 100644 --- a/apps/benchmarks/UniformGridGPU/UniformGridGPU.py +++ b/apps/benchmarks/UniformGridGPU/UniformGridGPU.py @@ -8,6 +8,7 @@ from pystencils.fast_approximation import insert_fast_sqrts, insert_fast_divisions from lbmpy import LBMConfig, LBMOptimisation, LBStencil, Method, Stencil +from lbmpy.enums import SubgridScaleModel from lbmpy.advanced_streaming import is_inplace from lbmpy.advanced_streaming.utility import streaming_patterns from lbmpy.boundaries import NoSlip, UBB @@ -84,7 +85,7 @@ }, 'smagorinsky': { 'method': Method.SRT, - 'smagorinsky': False, + 'subgrid_scale_model': SubgridScaleModel.SMAGORINSKY, 'relaxation_rate': omega, } } diff --git a/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.py b/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.py index 619c9fbf..a855b9d2 100644 --- a/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.py +++ b/apps/benchmarks/UniformGridGPU/old_ideas/UniformGridGPU.py @@ -1,6 +1,7 @@ import sympy as sp import numpy as np import pystencils as ps +from lbmpy.enums import Method, Stencil, SubgridScaleModel from lbmpy.creationfunctions import create_lb_method, create_lb_update_rule, create_lb_collision_rule from lbmpy.boundaries import NoSlip, UBB from lbmpy.fieldaccess import StreamPullTwoFieldsAccessor @@ -65,7 +66,7 @@ 'smagorinsky': { 'method': 'srt', 'stencil': 'D3Q19', - 'smagorinsky': True, + 'subgrid_scale_model': SubgridScaleModel.SMAGORINSKY, 'relaxation_rate': omega, }, 'cumulant': { diff --git a/apps/tutorials/lbm/06_LBBoundaryCondition.cpp b/apps/tutorials/lbm/06_LBBoundaryCondition.cpp index ae6f612c..8d095d22 100644 --- a/apps/tutorials/lbm/06_LBBoundaryCondition.cpp +++ b/apps/tutorials/lbm/06_LBBoundaryCondition.cpp @@ -268,8 +268,9 @@ BoundaryHandling_T* MyBoundaryHandling::operator()(IBlock* const block, else if (setup_.inflowType == "ParserUBB") { //! [forceBoundary_ParserUBB_eqs] - char x_eq[150]; - sprintf(x_eq, "0.1*4/%f/%f * y * (%f - y) * 0.5 * (1 - cos(2 * 3.1415926538 * t / %f));", H, H, H, setup_.period); + const uint_t maxSize = 150; + char x_eq[maxSize]; + snprintf(x_eq, maxSize, "0.1*4/%f/%f * y * (%f - y) * 0.5 * (1 - cos(2 * 3.1415926538 * t / %f));", H, H, H, setup_.period); std::array< std::string, 3 > eqs = { x_eq, "0", "0" }; handling->forceBoundary(ParserUBBFlagUID, west, ParserUBB_T::Parser(eqs)); diff --git a/src/pe/raytracing/Intersects.h b/src/pe/raytracing/Intersects.h index a956e4ef..92adb8f3 100644 --- a/src/pe/raytracing/Intersects.h +++ b/src/pe/raytracing/Intersects.h @@ -355,7 +355,10 @@ inline bool intersectsSphere(const Vec3& gpos, real_t radius, const Ray& ray, re real_t a = direction * direction; real_t b = real_t(2.) * (displacement * direction); real_t c = (displacement * displacement) - (radius * radius); - real_t discriminant = b*b - real_t(4.)*a*c; + // Hotfix for a floating point problem; see https://i10git.cs.fau.de/walberla/walberla/-/issues/243 + real_t discriminant_tmp1 = b*b; + real_t discriminant_tmp2 = -real_t(4.)*a*c; + real_t discriminant = discriminant_tmp1 + discriminant_tmp2; if (discriminant < 0) { // with discriminant smaller than 0, sphere is not hit by ray // (no solution for quadratic equation)