Merge branch 'main' into annotated_for_each

CExA-project · Jan 11, 2025 · 9bf07fc · 9bf07fc
2 parents 40a1dba + 0e6a56c
commit 9bf07fc
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 264 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.22)
-project(DDC VERSION 0.3.0 LANGUAGES CXX)
+project(DDC VERSION 0.4.0 LANGUAGES CXX)
 
 # List of options
 
@@ -192,7 +192,7 @@ endif()
 
 if("${DDC_BUILD_KERNELS_SPLINES}")
     # Ginkgo
-    find_package(Ginkgo 1.8.0 EXACT REQUIRED)
+    find_package(Ginkgo 1.8...<2 REQUIRED)
 
     # Lapacke
     find_package(LAPACKE REQUIRED)

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ To use DDC components, one needs the following dependencies:
 * (optional, IO interface) DDC::pdi
   * PDI 1.6...<2
 * (optional, spline interpolation) DDC::splines
-  * Ginkgo 1.8.0
+  * Ginkgo 1.8...<2
   * Kokkos Kernels 4.5.1...<5
 
 ## Getting the code and basic configuration

diff --git a/cmake/DDCConfig.cmake.in b/cmake/DDCConfig.cmake.in
@@ -24,7 +24,7 @@ if(@DDC_BUILD_KERNELS_FFT@)
 endif()
 
 if(@DDC_BUILD_KERNELS_SPLINES@)
-   ddc_find_dependency(Ginkgo 1.8.0 EXACT)
+   ddc_find_dependency(Ginkgo 1.8...<2)
    # DDC installs a FindLAPACKE.cmake file.
    # We choose to rely on it by prepending to CMAKE_MODULE_PATH
    # only the time of calling ddc_find_dependency.

diff --git a/include/ddc/discrete_domain.hpp b/include/ddc/discrete_domain.hpp
@@ -264,10 +264,9 @@ class DiscreteDomain<>
 
     KOKKOS_DEFAULTED_FUNCTION constexpr DiscreteDomain() = default;
 
-    // Construct a DiscreteDomain from a reordered copy of `domain`
-    template <class... ODDims>
-    KOKKOS_FUNCTION constexpr explicit DiscreteDomain(
-            [[maybe_unused]] DiscreteDomain<ODDims...> const& domain)
+    /// Construct a DiscreteDomain by copies and merge of domains
+    template <class... DDoms, class = std::enable_if_t<(is_discrete_domain_v<DDoms> && ...)>>
+    KOKKOS_FUNCTION constexpr explicit DiscreteDomain([[maybe_unused]] DDoms const&... domains)
     {
     }
 

diff --git a/install_test/CMakeLists.txt b/install_test/CMakeLists.txt
@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 3.22)
 project(test-installed-ddc LANGUAGES CXX)
 
-find_package(DDC 0.3 REQUIRED COMPONENTS fft pdi splines)
+find_package(DDC 0.4 REQUIRED COMPONENTS fft pdi splines)
 
 message("DDC options:")
 message("DDC_BUILD_DOUBLE_PRECISION=${DDC_BUILD_DOUBLE_PRECISION}")

diff --git a/tests/splines/batched_2d_spline_builder.cpp b/tests/splines/batched_2d_spline_builder.cpp