Skip to content

Commit

Permalink
progress
Browse files Browse the repository at this point in the history
  • Loading branch information
jngrad committed Jun 14, 2024
1 parent 72d35ea commit 85d369a
Show file tree
Hide file tree
Showing 36 changed files with 1,096 additions and 952 deletions.
76 changes: 76 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,40 @@ status_pending:
stage: prepare
script: sh maintainer/gh_post_status.sh pending

style:
<<: *global_job_definition
stage: build
dependencies: []
before_script:
- git config --global --add safe.directory ${CI_PROJECT_DIR}
- git submodule deinit .
script:
- sh maintainer/CI/fix_style.sh
tags:
- espresso
- no-cuda
variables:
GIT_SUBMODULE_STRATEGY: none
artifacts:
paths:
- style.patch
expire_in: 1 week
when: on_failure

style_doxygen:
<<: *global_job_definition
stage: build
dependencies: []
script:
- mkdir build
- cd build
- cp ../maintainer/configs/maxset.hpp myconfig.hpp
- cmake .. -D ESPRESSO_BUILD_WITH_CUDA=ON -D ESPRESSO_BUILD_WITH_GSL=ON -D ESPRESSO_BUILD_WITH_HDF5=ON -D ESPRESSO_BUILD_WITH_SCAFACOS=ON -D ESPRESSO_BUILD_WITH_WALBERLA=ON -D ESPRESSO_BUILD_WITH_WALBERLA_FFT=ON -D ESPRESSO_BUILD_WITH_STOKESIAN_DYNAMICS=ON -D ESPRESSO_BUILD_WITH_CALIPER=ON
- sh ../maintainer/CI/dox_warnings.sh
tags:
- espresso
- no-cuda

### Builds without CUDA

default:
Expand Down Expand Up @@ -402,6 +436,29 @@ empty:
- cuda
- numa

check_sphinx:
<<: *global_job_definition
stage: additional_checks
needs:
- cuda12-maxset
when: on_success
script:
- cd ${CI_PROJECT_DIR}/build
- make -t && make sphinx
- make -j2 tutorials
- make check_utils
- bash ${CI_PROJECT_DIR}/maintainer/CI/doc_warnings.sh
- python3 ${CI_PROJECT_DIR}/maintainer/CI/jupyter_warnings.py
artifacts:
paths:
- build/doc/sphinx
expire_in: 1 week
tags:
- espresso
- cuda
- numa
- reuse-artifacts-same-arch

run_tutorials:
<<: *global_job_definition
stage: additional_checks
Expand Down Expand Up @@ -430,6 +487,25 @@ run_tutorials:
only:
- schedules

run_doxygen:
<<: *global_job_definition
stage: additional_checks
needs:
- cuda12-maxset
when: on_success
script:
- cd ${CI_PROJECT_DIR}/build
- make -t && make doxygen
artifacts:
paths:
- build/doc/doxygen
expire_in: 1 week
tags:
- espresso
- no-cuda
- numa
- reuse-artifacts-same-arch

maxset_no_gpu:
<<: *global_job_definition
stage: additional_checks
Expand Down
1 change: 0 additions & 1 deletion maintainer/walberla_kernels/code_generation_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import pystencils_walberla



def earmark_generated_kernels():
"""
Add an earmark at the beginning of generated kernels to document the
Expand Down
4 changes: 3 additions & 1 deletion maintainer/walberla_kernels/generate_lb_kernels.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@ def paramlist(parameters, keys):
params
)

block_offsets = tuple(ps.TypedSymbol(f"block_offset_{i}", np.uint32) for i in range(3))
block_offsets = tuple(
ps.TypedSymbol(f"block_offset_{i}", np.uint32)
for i in range(3))

# generate thermalized LB
collision_rule_thermalized = lbmpy.creationfunctions.create_lb_collision_rule(
Expand Down
10 changes: 5 additions & 5 deletions maintainer/walberla_kernels/lbmpy_espresso.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ def data_initialisation(self, direction):
cell_args = [f"it.{direction}() + {bb_vec[i]}".replace('+ -', '-')
for i, direction in enumerate("xyz")]
code = [
"auto const InitialisationAdditionalData = elementInitialiser(",
f"Cell({', '.join(cell_args)}), blocks, *block);",
"element.vel_0 = InitialisationAdditionalData[0];",
"element.vel_1 = InitialisationAdditionalData[1];",
"element.vel_2 = InitialisationAdditionalData[2];",
"auto const InitialisationAdditionalData = elementInitialiser(",
f"Cell({', '.join(cell_args)}), blocks, *block);",
"element.vel_0 = InitialisationAdditionalData[0];",
"element.vel_1 = InitialisationAdditionalData[1];",
"element.vel_2 = InitialisationAdditionalData[2];",
]
return "\n".join(code)

Expand Down
Loading

0 comments on commit 85d369a

Please sign in to comment.