diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 411a9bfe9db080b1196e2bf1583a7c51d478f941..dad8d9f99ed32524b9eabfd3752dab670433fa6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,7 +415,7 @@ gcc_8_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -439,7 +439,7 @@ gcc_8_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -461,7 +461,7 @@ gcc_8_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -482,7 +482,7 @@ gcc_8_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -507,7 +507,7 @@ gcc_8_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -530,7 +530,7 @@ gcc_8_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -552,7 +552,7 @@ gcc_8_hybrid_dbg_sp: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -577,7 +577,7 @@ gcc_9_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -601,7 +601,7 @@ gcc_9_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -623,7 +623,7 @@ gcc_9_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -644,7 +644,7 @@ gcc_9_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -669,7 +669,7 @@ gcc_9_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -692,7 +692,7 @@ gcc_9_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -714,7 +714,7 @@ gcc_9_hybrid_dbg_sp: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -739,7 +739,7 @@ gcc_10_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -763,7 +763,7 @@ gcc_10_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -785,7 +785,7 @@ gcc_10_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -806,7 +806,7 @@ gcc_10_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -831,7 +831,7 @@ gcc_10_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -854,7 +854,7 @@ gcc_10_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -876,7 +876,7 @@ gcc_10_hybrid_dbg_sp: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -901,7 +901,7 @@ gcc_11_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -925,7 +925,7 @@ gcc_11_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -947,7 +947,7 @@ gcc_11_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -968,7 +968,7 @@ gcc_11_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -993,7 +993,7 @@ gcc_11_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1016,7 +1016,7 @@ gcc_11_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1038,7 +1038,7 @@ gcc_11_hybrid_dbg_sp: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1343,7 +1343,7 @@ clang_11.0_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1367,7 +1367,7 @@ clang_11.0_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1389,7 +1389,7 @@ clang_11.0_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1410,7 +1410,7 @@ clang_11.0_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1435,7 +1435,7 @@ clang_11.0_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1458,7 +1458,7 @@ clang_11.0_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1480,7 +1480,7 @@ clang_11.0_hybrid_dbg_sp: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1505,7 +1505,7 @@ clang_12.0_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1529,7 +1529,7 @@ clang_12.0_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1551,7 +1551,7 @@ clang_12.0_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1572,7 +1572,7 @@ clang_12.0_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1597,7 +1597,7 @@ clang_12.0_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1620,7 +1620,7 @@ clang_12.0_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1642,7 +1642,7 @@ clang_12.0_hybrid_dbg_sp: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1667,7 +1667,7 @@ clang_13.0_serial: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1691,7 +1691,7 @@ clang_13.0_mpionly: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1713,7 +1713,7 @@ clang_13.0_hybrid: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1731,7 +1731,7 @@ clang_13.0_serial_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1753,7 +1753,7 @@ clang_13.0_mpionly_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1773,7 +1773,7 @@ clang_13.0_hybrid_dbg: extends: .build_template image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list @@ -1793,7 +1793,7 @@ clang_13.0_hybrid_dbg_sp: image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 stage: pretest before_script: - - pip3 install lbmpy==1.2 jinja2 pytest + - pip3 install lbmpy==1.3.2 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - pip3 list diff --git a/CMakeLists.txt b/CMakeLists.txt index 77369d876b90e89761e33e8d12fca0547882fafc..3ff2ea2a89bd9c49c0b294585ed7cff6b9719447 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,7 +607,7 @@ endif () ## ############################################################################################################################# if ( WALBERLA_BUILD_WITH_CODEGEN ) - set(LBMPY_MIN_VERSION 1.2) + set(LBMPY_MIN_VERSION 1.3.2) execute_process(COMMAND ${Python_EXECUTABLE} -c "import lbmpy; print(lbmpy.__version__)" RESULT_VARIABLE LBMPY_FOUND OUTPUT_VARIABLE LBMPY_VERSION) if(NOT LBMPY_FOUND EQUAL 0)