Skip to content

Commit cee1c8f

Browse files
committed
WIP: fix CMake and try new images with hwloc
1 parent 03dee06 commit cee1c8f

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/push_pull.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
debian:
5353
runs-on: ubuntu-latest
5454
container:
55-
image: ghcr.io/espressomd/docker/debian:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc-base-layer
55+
image: ghcr.io/jngrad/espresso-docker/debian:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc-base-layer
5656
credentials:
5757
username: ${{ github.actor }}
5858
password: ${{ secrets.github_token }}
@@ -93,7 +93,7 @@ jobs:
9393
runs-on: ubuntu-latest
9494
if: ${{ github.repository == 'espressomd/espresso' }}
9595
container:
96-
image: ghcr.io/espressomd/docker/ubuntu-wo-dependencies:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc-base-layer
96+
image: ghcr.io/jngrad/espresso-docker/ubuntu-wo-dependencies:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc-base-layer
9797
credentials:
9898
username: ${{ github.actor }}
9999
password: ${{ secrets.github_token }}
@@ -135,7 +135,7 @@ jobs:
135135
runs-on: ubuntu-latest
136136
if: ${{ github.repository == 'espressomd/espresso' }}
137137
container:
138-
image: ghcr.io/espressomd/docker/fedora:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc-base-layer
138+
image: ghcr.io/jngrad/espresso-docker/fedora:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc-base-layer
139139
credentials:
140140
username: ${{ github.actor }}
141141
password: ${{ secrets.github_token }}
@@ -165,7 +165,7 @@ jobs:
165165
with_hdf5: 'true'
166166
with_fftw: 'true'
167167
with_fpe: 'true'
168-
with_gsl: 'false'
168+
with_gsl: 'true'
169169
with_scafacos: 'false'
170170
with_walberla: 'true'
171171
with_walberla_avx: 'false'

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: ghcr.io/espressomd/docker/ubuntu:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc
1+
image: ghcr.io/jngrad/espresso-docker/ubuntu:4d3e236db5ae334ddcc9c3c82aae7637faa5dabc
22

33
stages:
44
- prepare

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,6 @@ if(NOT DEFINED Kokkos_FOUND OR NOT ${Kokkos_FOUND})
680680
TARGET kokkos APPEND
681681
PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
682682
$<TARGET_PROPERTY:kokkos,INTERFACE_INCLUDE_DIRECTORIES>)
683-
set_target_properties(kokkos PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "")
684683
endif()
685684

686685
if(NOT EXISTS ${FETCHCONTENT_BASE_DIR}/cabana-src)
@@ -697,6 +696,11 @@ if(NOT DEFINED Cabana_FOUND OR NOT ${Cabana_FOUND})
697696
# cmake-format: on
698697
set(Cabana_REQUIRE_HEFFTE ${ESPRESSO_BUILD_WITH_FFTW} CACHE BOOL "")
699698
FetchContent_MakeAvailable(cabana)
699+
# mark Cabana headers as system headers to disable compiler diagnostics
700+
set_property(
701+
TARGET Core APPEND
702+
PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
703+
$<TARGET_PROPERTY:Core,INTERFACE_INCLUDE_DIRECTORIES>)
700704
endif()
701705

702706
# We need the parallel hdf5 version!

src/core/particle_reduction.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ template <typename ResultType, typename Kernel> class KokkosReducer {
5858
KokkosReducer(Kernel kernel, ReductionOp<ResultType> reduction_op)
5959
: reduction_op(std::move(reduction_op)), kernel(std::move(kernel)) {}
6060
KokkosReducer(KokkosReducer const &other)
61-
: reduction_op(other.reduction_op), kernel(other.kernel) {};
61+
: reduction_op(other.reduction_op), kernel(other.kernel) {}
6262

6363
KOKKOS_INLINE_FUNCTION void operator()(std::integral auto const i,
6464
value_type &update) const {

0 commit comments

Comments
 (0)