From 375caebf236401f1310f1628d0cb24948f3c6033 Mon Sep 17 00:00:00 2001 From: Dominik Thoennes <dominik.thoennes@fau.de> Date: Thu, 29 Aug 2024 10:45:22 +0200 Subject: [PATCH] update lbmpy to 1.3.5 --- .gitlab-ci.yml | 127 ++++++++++++++++--------------- extern/pybind11 | 2 +- tests/field/codegen/Poisson.py | 4 +- tests/gpu/codegen/CudaPoisson.py | 4 +- 4 files changed, 69 insertions(+), 68 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 187dd2c31..c46b9090f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ stages: .build_template: script: + - source /entrypoint.sh - pip install -I cmake==3.16.3 jinja2 - export NUM_CORES=$(nproc --all) - export MAX_BUILD_CORES=$(( $(awk '( $1 == "MemTotal:" ) { print $2 }' /proc/meminfo) / ( 4 * 1024 * 1024 ) )) @@ -276,7 +277,7 @@ gcc_10_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -305,7 +306,7 @@ gcc_10_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -332,7 +333,7 @@ gcc_10_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -358,7 +359,7 @@ gcc_10_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -388,7 +389,7 @@ gcc_10_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -416,7 +417,7 @@ gcc_10_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -440,7 +441,7 @@ gcc_10_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -470,7 +471,7 @@ gcc_11_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -499,7 +500,7 @@ gcc_11_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -526,7 +527,7 @@ gcc_11_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -552,7 +553,7 @@ gcc_11_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -582,7 +583,7 @@ gcc_11_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -610,7 +611,7 @@ gcc_11_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -637,7 +638,7 @@ gcc_11_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -667,7 +668,7 @@ gcc_12_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -696,7 +697,7 @@ gcc_12_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -723,7 +724,7 @@ gcc_12_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -749,7 +750,7 @@ gcc_12_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -779,7 +780,7 @@ gcc_12_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -807,7 +808,7 @@ gcc_12_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -834,7 +835,7 @@ gcc_12_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -864,7 +865,7 @@ gcc_13_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -894,7 +895,7 @@ gcc_13_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -923,7 +924,7 @@ gcc_13_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -947,7 +948,7 @@ gcc_13_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -975,7 +976,7 @@ gcc_13_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1001,7 +1002,7 @@ gcc_13_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1026,7 +1027,7 @@ gcc_13_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1054,7 +1055,7 @@ clang_14_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1083,7 +1084,7 @@ clang_14_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1110,7 +1111,7 @@ clang_14_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1136,7 +1137,7 @@ clang_14_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1166,7 +1167,7 @@ clang_14_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1194,7 +1195,7 @@ clang_14_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1218,7 +1219,7 @@ clang_14_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1248,7 +1249,7 @@ clang_15_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1277,7 +1278,7 @@ clang_15_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1304,7 +1305,7 @@ clang_15_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1330,7 +1331,7 @@ clang_15_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1360,7 +1361,7 @@ clang_15_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1388,7 +1389,7 @@ clang_15_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1415,7 +1416,7 @@ clang_15_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1445,7 +1446,7 @@ clang_16_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1474,7 +1475,7 @@ clang_16_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1501,7 +1502,7 @@ clang_16_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1527,7 +1528,7 @@ clang_16_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1557,7 +1558,7 @@ clang_16_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1585,7 +1586,7 @@ clang_16_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1612,7 +1613,7 @@ clang_16_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1642,7 +1643,7 @@ clang_17_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1671,7 +1672,7 @@ clang_17_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1698,7 +1699,7 @@ clang_17_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1721,7 +1722,7 @@ clang_17_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1748,7 +1749,7 @@ clang_17_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1773,7 +1774,7 @@ clang_17_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1798,7 +1799,7 @@ clang_17_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1825,7 +1826,7 @@ aocc_4_serial: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1854,7 +1855,7 @@ aocc_4_mpionly: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1881,7 +1882,7 @@ aocc_4_hybrid: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1904,7 +1905,7 @@ aocc_4_serial_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1931,7 +1932,7 @@ aocc_4_mpionly_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1956,7 +1957,7 @@ aocc_4_hybrid_dbg: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list @@ -1980,7 +1981,7 @@ aocc_4_hybrid_dbg_sp: before_script: - python3 -m venv ci-venv - source ci-venv/bin/activate - - python3 -m pip install lbmpy==1.3.4 jinja2 pytest + - python3 -m pip install lbmpy==1.3.5 jinja2 pytest - cd python - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pip list diff --git a/extern/pybind11 b/extern/pybind11 index f7b499615..7c33cdc2d 160000 --- a/extern/pybind11 +++ b/extern/pybind11 @@ -1 +1 @@ -Subproject commit f7b499615e14d70ab098a20deb0cdb3889998a1a +Subproject commit 7c33cdc2d39c7b99a122579f53bc94c8eb3332ff diff --git a/tests/field/codegen/Poisson.py b/tests/field/codegen/Poisson.py index 8e27d5f8d..898f08d8d 100644 --- a/tests/field/codegen/Poisson.py +++ b/tests/field/codegen/Poisson.py @@ -12,8 +12,8 @@ with CodeGeneration() as ctx: @ps.kernel def kernel_func(): - src[0, 0] @= ((dy2 * (src[1, 0] + src[-1, 0])) + dst[0, 0] @= ((dy2 * (src[1, 0] + src[-1, 0])) + (dx2 * (src[0, 1] + src[0, -1])) - (rhs[0, 0] * dx2 * dy2)) / (2.0 * (dx2 + dy2)) - generate_sweep(ctx, 'Poisson', kernel_func) + generate_sweep(ctx, 'Poisson', kernel_func, field_swaps=[(src, dst), ]) diff --git a/tests/gpu/codegen/CudaPoisson.py b/tests/gpu/codegen/CudaPoisson.py index 24e471a8d..d9d4ce892 100644 --- a/tests/gpu/codegen/CudaPoisson.py +++ b/tests/gpu/codegen/CudaPoisson.py @@ -12,8 +12,8 @@ with CodeGeneration() as ctx: @ps.kernel def kernel_func(): - src[0, 0] @= ((dy**2 * (src[1, 0] + src[-1, 0])) + dst[0, 0] @= ((dy**2 * (src[1, 0] + src[-1, 0])) + (dx**2 * (src[0, 1] + src[0, -1])) - (rhs[0, 0] * dx**2 * dy**2)) / (2 * (dx**2 + dy**2)) - generate_sweep(ctx, 'PoissonGPU', kernel_func, target=ps.Target.GPU) + generate_sweep(ctx, 'PoissonGPU', kernel_func, field_swaps=[(src, dst), ], target=ps.Target.GPU) -- GitLab