From 0560bc0aab9c03469084e585250166a01b1d715c Mon Sep 17 00:00:00 2001
From: Markus Holzer <markus.holzer@fau.de>
Date: Wed, 16 Nov 2022 13:09:01 +0100
Subject: [PATCH] Update pystencils version in CI
---
.gitlab-ci.yml | 98 +++++++++----------
.../FluidParticleCoupling/GeneratedLBM.py | 2 +-
.../GeneratedLBMWithForce.py | 2 +-
3 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a32e9666..0b596efcb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -413,7 +413,7 @@ gcc_8_serial:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -437,7 +437,7 @@ gcc_8_mpionly:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -459,7 +459,7 @@ gcc_8_hybrid:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -480,7 +480,7 @@ gcc_8_serial_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -505,7 +505,7 @@ gcc_8_mpionly_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -528,7 +528,7 @@ gcc_8_hybrid_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -550,7 +550,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -575,7 +575,7 @@ gcc_9_serial:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -599,7 +599,7 @@ gcc_9_mpionly:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -621,7 +621,7 @@ gcc_9_hybrid:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -642,7 +642,7 @@ gcc_9_serial_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -667,7 +667,7 @@ gcc_9_mpionly_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -690,7 +690,7 @@ gcc_9_hybrid_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -712,7 +712,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -737,7 +737,7 @@ gcc_10_serial:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -761,7 +761,7 @@ gcc_10_mpionly:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -783,7 +783,7 @@ gcc_10_hybrid:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -804,7 +804,7 @@ gcc_10_serial_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -829,7 +829,7 @@ gcc_10_mpionly_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -852,7 +852,7 @@ gcc_10_hybrid_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -874,7 +874,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -899,7 +899,7 @@ gcc_11_serial:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -923,7 +923,7 @@ gcc_11_mpionly:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -946,7 +946,7 @@ gcc_11_hybrid:
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
stage: pretest
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -964,7 +964,7 @@ gcc_11_serial_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -986,7 +986,7 @@ gcc_11_mpionly_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1006,7 +1006,7 @@ gcc_11_hybrid_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script:
- - pip3 install lbmpy==1.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1025,7 +1025,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1539,7 +1539,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1563,7 +1563,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1585,7 +1585,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1606,7 +1606,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1631,7 +1631,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1654,7 +1654,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1676,7 +1676,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1701,7 +1701,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1725,7 +1725,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1747,7 +1747,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1768,7 +1768,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1793,7 +1793,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1816,7 +1816,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1838,7 +1838,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1863,7 +1863,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1887,7 +1887,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1909,7 +1909,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1927,7 +1927,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1949,7 +1949,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1969,7 +1969,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
@@ -1989,7 +1989,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.0 jinja2 pytest
+ - pip3 install lbmpy==1.1 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- pip3 list
diff --git a/apps/benchmarks/FluidParticleCoupling/GeneratedLBM.py b/apps/benchmarks/FluidParticleCoupling/GeneratedLBM.py
index 8274c20a5..43113dcf8 100644
--- a/apps/benchmarks/FluidParticleCoupling/GeneratedLBM.py
+++ b/apps/benchmarks/FluidParticleCoupling/GeneratedLBM.py
@@ -44,7 +44,7 @@ with CodeGeneration() as ctx:
]
# relaxation rate for first group of moments (1,x,y,z) is set to zero internally
- relaxation_rates = [omegaBulk.center_vector, omegaBulk.center_vector,
+ relaxation_rates = [omegaBulk.center, omegaBulk.center,
omegaMagic, omegaVisc, omegaVisc, omegaMagic]
lbm_config = LBMConfig(stencil=stencil, method=Method.MRT, continuous_equilibrium=False,
diff --git a/apps/benchmarks/FluidParticleCoupling/GeneratedLBMWithForce.py b/apps/benchmarks/FluidParticleCoupling/GeneratedLBMWithForce.py
index 4968f0670..77bdf0cd5 100644
--- a/apps/benchmarks/FluidParticleCoupling/GeneratedLBMWithForce.py
+++ b/apps/benchmarks/FluidParticleCoupling/GeneratedLBMWithForce.py
@@ -49,7 +49,7 @@ with CodeGeneration() as ctx:
]
# relaxation rate for first group of moments (1,x,y,z) is set to zero internally
- relaxation_rates = [omegaBulk.center_vector, omegaBulk.center_vector,
+ relaxation_rates = [omegaBulk.center, omegaBulk.center,
omegaMagic, omegaVisc, omegaVisc, omegaMagic]
lbm_config = LBMConfig(stencil=stencil, method=Method.MRT, continuous_equilibrium=False,
--
GitLab