revert_to_working

.gitlab-ci.yml

@@ -41,40 +41,6 @@ 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:
@@ -436,29 +402,6 @@ 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
@@ -487,25 +430,6 @@ 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

CMakeLists.txt

@@ -523,25 +523,16 @@ if(ESPRESSO_BUILD_WITH_ASAN)
   target_compile_options(espresso_cpp_flags INTERFACE -fsanitize=address
                                                       -fno-omit-frame-pointer)
   target_link_libraries(espresso_cpp_flags INTERFACE -fsanitize=address)
-  if(ESPRESSO_BUILD_WITH_CUDA)
-    target_link_libraries(espresso_cuda_flags INTERFACE -fsanitize=address)
-  endif()
 endif()
 if(ESPRESSO_BUILD_WITH_MSAN)
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -O1")
   target_compile_options(espresso_cpp_flags INTERFACE -fsanitize=memory
                                                       -fno-omit-frame-pointer)
   target_link_libraries(espresso_cpp_flags INTERFACE -fsanitize=memory)
-  if(ESPRESSO_BUILD_WITH_CUDA)
-    target_link_libraries(espresso_cuda_flags INTERFACE -fsanitize=memory)
-  endif()
 endif()
 if(ESPRESSO_BUILD_WITH_UBSAN)
   target_compile_options(espresso_cpp_flags INTERFACE -fsanitize=undefined)
   target_link_libraries(espresso_cpp_flags INTERFACE -fsanitize=undefined)
-  if(ESPRESSO_BUILD_WITH_CUDA)
-    target_link_libraries(espresso_cuda_flags INTERFACE -fsanitize=undefined)
-  endif()
 endif()
 
 target_link_libraries(espresso_cpp_flags INTERFACE espresso::coverage_flags)

maintainer/walberla_kernels/code_generation_context.py

@@ -26,6 +26,7 @@
 import pystencils_walberla
 
 
+
 def earmark_generated_kernels():
     """
     Add an earmark at the beginning of generated kernels to document the

maintainer/walberla_kernels/generate_lb_kernels.py

@@ -149,9 +149,7 @@ 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(

maintainer/walberla_kernels/lbmpy_espresso.py

@@ -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)
 

src/core/CMakeLists.txt

@@ -82,9 +82,9 @@ install(TARGETS espresso_core
 
 target_link_libraries(
   espresso_core PRIVATE espresso::config espresso::utils::mpi espresso::shapes
-                        espresso::cpp_flags
+                        espresso::profiler espresso::cpp_flags
   PUBLIC espresso::utils MPI::MPI_CXX Random123 espresso::particle_observables
-         Boost::serialization Boost::mpi espresso::profiler)
+         Boost::serialization Boost::mpi)
 
 target_include_directories(espresso_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})