Skip to content

Commit f54bfd1

Browse files
authored
Use upstreamed Kokkos Kernels 4.7 algorithms (CExA-project#1075)
* Use upstreamed Kokkos Kernels 4.7 algorithms * Apply suggestion from @tpadioleau
1 parent 0591059 commit f54bfd1

File tree

10 files changed

+20
-390
lines changed

10 files changed

+20
-390
lines changed

.github/workflows/tests-ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
clang-format-version: '21'
5454
- name: Prefer 'if defined'/'if !defined' over 'ifdef'/'ifndef'
55-
run: if grep -RE "(ifdef|ifndef)" $(git ls-files '*.[ch]pp' ':!*/kokkos-kernels-ext/*'); then exit 1; fi
55+
run: if grep -RE "(ifdef|ifndef)" $(git ls-files '*.[ch]pp'); then exit 1; fi
5656
- name: Do not include <iostream> in the headers of the library
5757
run: if grep -R "#include <iostream>" $(git ls-files 'src/*.[ch]pp'); then exit 1; fi
5858
- name: Find modifications of Kokkos reserved macros

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ if("${DDC_BUILD_KERNELS_SPLINES}")
264264
elseif("${DDC_KokkosKernels_DEPENDENCY_POLICY}" STREQUAL "EMBEDDED")
265265
ddc_configure_kokkos_kernels()
266266
elseif("${DDC_KokkosKernels_DEPENDENCY_POLICY}" STREQUAL "INSTALLED")
267-
find_package(KokkosKernels 4.5.1...<6 REQUIRED)
267+
find_package(KokkosKernels 4.7...<6 REQUIRED)
268268
endif()
269269

270270
add_library(ddc_splines)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To use DDC components, one needs the following dependencies:
5353
* PDI 1.10.1...<2
5454
* (optional, spline interpolation) DDC::splines
5555
* Ginkgo 1.8...<2
56-
* Kokkos Kernels 4.5.1...<6
56+
* Kokkos Kernels 4.7...<6
5757

5858
## Getting the code and basic configuration
5959

docs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(DOXYGEN_EXAMPLE_PATH "${DDC_SOURCE_DIR}/examples")
1414
set(DOXYGEN_EXPAND_ONLY_PREDEF YES)
1515
set(DOXYGEN_EXTRACT_ALL YES CACHE STRING "")
1616
set(DOXYGEN_EXCLUDE_SYMBOLS "detail")
17-
set(DOXYGEN_EXCLUDE_PATTERNS "*/detail/*;*/experimental/*;*/kokkos-kernels-ext/*")
17+
set(DOXYGEN_EXCLUDE_PATTERNS "*/detail/*;*/experimental/*")
1818
set(DOXYGEN_EXTRACT_LOCAL_CLASSES YES)
1919
set(DOXYGEN_FULL_PATH_NAMES NO)
2020
set(DOXYGEN_HTML_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html")

src/ddc/kernels/splines/kokkos-kernels-ext/KokkosBatched_Gbtrs.hpp

Lines changed: 0 additions & 59 deletions
This file was deleted.

src/ddc/kernels/splines/kokkos-kernels-ext/KokkosBatched_Gbtrs_Serial_Impl.hpp

Lines changed: 0 additions & 170 deletions
This file was deleted.

src/ddc/kernels/splines/kokkos-kernels-ext/KokkosBatched_Getrs.hpp

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)