Commit 31ad4832 authored by Helen Schottenhamml's avatar Helen Schottenhamml
Browse files

Merge branch 'AdaptionToPystencils' into 'master'

Adaption for CodeGen pipeline

Closes #166, #165, and #167

See merge request walberla/walberla!547
parents 086dcd27 2f7b33ed
...@@ -72,6 +72,4 @@ cmake_install.cmake ...@@ -72,6 +72,4 @@ cmake_install.cmake
CMakeDefs.h CMakeDefs.h
/moduleStatistics.json /moduleStatistics.json
/walberla-config.cmake /walberla-config.cmake
/cmake-build-debug/ cmake-build-*
/cmake-build-release/
/cmake-build-debug-remote/
...@@ -503,7 +503,7 @@ gcc_9_serial: ...@@ -503,7 +503,7 @@ gcc_9_serial:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -526,7 +526,7 @@ gcc_9_mpionly: ...@@ -526,7 +526,7 @@ gcc_9_mpionly:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -547,7 +547,7 @@ gcc_9_hybrid: ...@@ -547,7 +547,7 @@ gcc_9_hybrid:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -567,7 +567,7 @@ gcc_9_serial_dbg: ...@@ -567,7 +567,7 @@ gcc_9_serial_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -591,7 +591,7 @@ gcc_9_mpionly_dbg: ...@@ -591,7 +591,7 @@ gcc_9_mpionly_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -613,7 +613,7 @@ gcc_9_hybrid_dbg: ...@@ -613,7 +613,7 @@ gcc_9_hybrid_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -633,12 +633,20 @@ gcc_9_hybrid_dbg: ...@@ -633,12 +633,20 @@ gcc_9_hybrid_dbg:
gcc_9_hybrid_dbg_sp: gcc_9_hybrid_dbg_sp:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
before_script:
- pip3 install lbmpy==1.0 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables: variables:
WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized" CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only: only:
variables: variables:
- $ENABLE_NIGHTLY_BUILDS - $ENABLE_NIGHTLY_BUILDS
...@@ -650,7 +658,7 @@ gcc_10_serial: ...@@ -650,7 +658,7 @@ gcc_10_serial:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -673,7 +681,7 @@ gcc_10_mpionly: ...@@ -673,7 +681,7 @@ gcc_10_mpionly:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -694,7 +702,7 @@ gcc_10_hybrid: ...@@ -694,7 +702,7 @@ gcc_10_hybrid:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -714,7 +722,7 @@ gcc_10_serial_dbg: ...@@ -714,7 +722,7 @@ gcc_10_serial_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -738,7 +746,7 @@ gcc_10_mpionly_dbg: ...@@ -738,7 +746,7 @@ gcc_10_mpionly_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -760,7 +768,7 @@ gcc_10_hybrid_dbg: ...@@ -760,7 +768,7 @@ gcc_10_hybrid_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -780,12 +788,20 @@ gcc_10_hybrid_dbg: ...@@ -780,12 +788,20 @@ gcc_10_hybrid_dbg:
gcc_10_hybrid_dbg_sp: gcc_10_hybrid_dbg_sp:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:10
before_script:
- pip3 install lbmpy==1.0 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables: variables:
WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized" CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only: only:
variables: variables:
- $ENABLE_NIGHTLY_BUILDS - $ENABLE_NIGHTLY_BUILDS
...@@ -797,7 +813,7 @@ gcc_11_serial: ...@@ -797,7 +813,7 @@ gcc_11_serial:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -820,7 +836,7 @@ gcc_11_mpionly: ...@@ -820,7 +836,7 @@ gcc_11_mpionly:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -842,11 +858,12 @@ gcc_11_hybrid: ...@@ -842,11 +858,12 @@ gcc_11_hybrid:
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
stage: pretest stage: pretest
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
- CC=gcc CXX=g++ pip3 install pycuda - CC=gcc CXX=g++ pip3 install pycuda
- pip3 list
variables: variables:
WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON"
...@@ -859,7 +876,7 @@ gcc_11_serial_dbg: ...@@ -859,7 +876,7 @@ gcc_11_serial_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -880,7 +897,7 @@ gcc_11_mpionly_dbg: ...@@ -880,7 +897,7 @@ gcc_11_mpionly_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -899,7 +916,7 @@ gcc_11_hybrid_dbg: ...@@ -899,7 +916,7 @@ gcc_11_hybrid_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -916,12 +933,20 @@ gcc_11_hybrid_dbg: ...@@ -916,12 +933,20 @@ gcc_11_hybrid_dbg:
gcc_11_hybrid_dbg_sp: gcc_11_hybrid_dbg_sp:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11 image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:11
before_script:
- pip3 install lbmpy==1.0 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables: variables:
WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized" CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
tags: tags:
- cuda11 - cuda11
- docker - docker
...@@ -1422,7 +1447,7 @@ clang_11.0_serial: ...@@ -1422,7 +1447,7 @@ clang_11.0_serial:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1445,7 +1470,7 @@ clang_11.0_mpionly: ...@@ -1445,7 +1470,7 @@ clang_11.0_mpionly:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1466,7 +1491,7 @@ clang_11.0_hybrid: ...@@ -1466,7 +1491,7 @@ clang_11.0_hybrid:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1486,7 +1511,7 @@ clang_11.0_serial_dbg: ...@@ -1486,7 +1511,7 @@ clang_11.0_serial_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1510,7 +1535,7 @@ clang_11.0_mpionly_dbg: ...@@ -1510,7 +1535,7 @@ clang_11.0_mpionly_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1532,7 +1557,7 @@ clang_11.0_hybrid_dbg: ...@@ -1532,7 +1557,7 @@ clang_11.0_hybrid_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1552,12 +1577,20 @@ clang_11.0_hybrid_dbg: ...@@ -1552,12 +1577,20 @@ clang_11.0_hybrid_dbg:
clang_11.0_hybrid_dbg_sp: clang_11.0_hybrid_dbg_sp:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
before_script:
- pip3 install lbmpy==1.0 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables: variables:
WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized" CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only: only:
variables: variables:
- $ENABLE_NIGHTLY_BUILDS - $ENABLE_NIGHTLY_BUILDS
...@@ -1569,7 +1602,7 @@ clang_12.0_serial: ...@@ -1569,7 +1602,7 @@ clang_12.0_serial:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1592,7 +1625,7 @@ clang_12.0_mpionly: ...@@ -1592,7 +1625,7 @@ clang_12.0_mpionly:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1613,7 +1646,7 @@ clang_12.0_hybrid: ...@@ -1613,7 +1646,7 @@ clang_12.0_hybrid:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1633,7 +1666,7 @@ clang_12.0_serial_dbg: ...@@ -1633,7 +1666,7 @@ clang_12.0_serial_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1657,7 +1690,7 @@ clang_12.0_mpionly_dbg: ...@@ -1657,7 +1690,7 @@ clang_12.0_mpionly_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1679,7 +1712,7 @@ clang_12.0_hybrid_dbg: ...@@ -1679,7 +1712,7 @@ clang_12.0_hybrid_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1699,12 +1732,20 @@ clang_12.0_hybrid_dbg: ...@@ -1699,12 +1732,20 @@ clang_12.0_hybrid_dbg:
clang_12.0_hybrid_dbg_sp: clang_12.0_hybrid_dbg_sp:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
before_script:
- pip3 install lbmpy==1.0 jinja2 pytest
- cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables: variables:
WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized" CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only: only:
variables: variables:
- $ENABLE_NIGHTLY_BUILDS - $ENABLE_NIGHTLY_BUILDS
...@@ -1716,7 +1757,7 @@ clang_13.0_serial: ...@@ -1716,7 +1757,7 @@ clang_13.0_serial:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1739,7 +1780,7 @@ clang_13.0_mpionly: ...@@ -1739,7 +1780,7 @@ clang_13.0_mpionly:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1760,7 +1801,7 @@ clang_13.0_hybrid: ...@@ -1760,7 +1801,7 @@ clang_13.0_hybrid:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1777,7 +1818,7 @@ clang_13.0_serial_dbg: ...@@ -1777,7 +1818,7 @@ clang_13.0_serial_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1798,7 +1839,7 @@ clang_13.0_mpionly_dbg: ...@@ -1798,7 +1839,7 @@ clang_13.0_mpionly_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd .. - cd ..
...@@ -1817,7 +1858,7 @@ clang_13.0_hybrid_dbg: ...@@ -1817,7 +1858,7 @@ clang_13.0_hybrid_dbg:
extends: .build_template extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0 image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
before_script: before_script:
- pip3 install lbmpy==0.4.1 jinja2 pytest - pip3 install lbmpy==1.0 jinja2 pytest
- cd python - cd python