Sync DDC

See merge request gysela-developpers/gyselalibxx!426

--------------------------------------------

vendor/ddc/.github/workflows/pages.yml

@@ -31,6 +31,7 @@ jobs:
         echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin || true
         docker pull ghcr.io/cexa-project/ddc/doxygen || true
         DOCKER_BUILDKIT=1 docker build \
+          --build-arg BUILDKIT_INLINE_CACHE=1 \
           --cache-from ghcr.io/cexa-project/ddc/doxygen \
           -t ghcr.io/cexa-project/ddc/doxygen \
           -t ghcr.io/cexa-project/ddc/doxygen:${GITHUB_SHA:0:7} \

vendor/ddc/docs/CMakeLists.txt

@@ -19,7 +19,8 @@ set(DOXYGEN_ENUM_VALUES_PER_LINE 1)
 set(DOXYGEN_EXAMPLE_PATH "${DDC_SOURCE_DIR}/examples")
 set(DOXYGEN_EXPAND_ONLY_PREDEF YES)
 set(DOXYGEN_EXTRACT_ALL YES)
-set(DOXYGEN_EXCLUDE_SYMBOLS "detail" "details")
+set(DOXYGEN_EXCLUDE_SYMBOLS "detail")
+set(DOXYGEN_EXCLUDE_PATTERNS "*/experimental/*;*/detail/*")
 set(DOXYGEN_EXTRACT_LOCAL_CLASSES YES)
 set(DOXYGEN_FULL_PATH_NAMES NO)
 set(DOXYGEN_GENERATE_TREEVIEW YES)
@@ -39,7 +40,7 @@ set(DOXYGEN_PREDEFINED "DOXYGEN_IGNORE")
 set(DOXYGEN_PROJECT_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/_template/logo.png")
 set(DOXYGEN_PROJECT_NUMBER "${DDC_VERSION}")
 set(DOXYGEN_QT_AUTOBRIEF YES)
-set(DOXYGEN_RECURSIVE NO)
+set(DOXYGEN_RECURSIVE YES)
 set(DOXYGEN_SEARCHENGINE NO)
 set(DOXYGEN_SHOW_FILES NO)
 set(DOXYGEN_SHOW_INCLUDE_FILES NO)

vendor/ddc/include/ddc/chunk.hpp

@@ -11,6 +11,7 @@
 
 #include "ddc/chunk_common.hpp"
 #include "ddc/chunk_span.hpp"
+#include "ddc/chunk_traits.hpp"
 #include "ddc/kokkos_allocator.hpp"
 #include "ddc/parallel_deepcopy.hpp"
 

vendor/ddc/include/ddc/chunk_common.hpp

@@ -13,48 +13,12 @@
 
 #include <Kokkos_Core.hpp>
 
+#include "ddc/chunk_traits.hpp"
 #include "ddc/detail/macros.hpp"
 #include "ddc/discrete_domain.hpp"
 
 namespace ddc {
 
-template <class T>
-inline constexpr bool enable_borrowed_chunk = false;
-
-template <class T>
-inline constexpr bool enable_chunk = false;
-
-template <class T>
-inline constexpr bool is_chunk_v = enable_chunk<std::remove_const_t<std::remove_reference_t<T>>>;
-
-template <class T>
-inline constexpr bool is_borrowed_chunk_v
-        = is_chunk_v<
-                  T> && (std::is_lvalue_reference_v<T> || enable_borrowed_chunk<std::remove_cv_t<std::remove_reference_t<T>>>);
-
-template <class T>
-struct chunk_traits
-{
-    static_assert(is_chunk_v<T>);
-    using value_type
-            = std::remove_cv_t<std::remove_pointer_t<decltype(std::declval<T>().data_handle())>>;
-    using pointer_type = decltype(std::declval<T>().data_handle());
-    using reference_type = decltype(*std::declval<T>().data_handle());
-};
-
-template <class T>
-using chunk_value_t = typename chunk_traits<T>::value_type;
-
-template <class T>
-using chunk_pointer_t = typename chunk_traits<T>::pointer_type;
-
-template <class T>
-using chunk_reference_t = typename chunk_traits<T>::reference_type;
-
-template <class T>
-inline constexpr bool is_writable_chunk_v
-        = !std::is_const_v<std::remove_pointer_t<chunk_pointer_t<T>>>;
-
 /** Access the domain (or subdomain) of a view
  * @param[in]  chunk the view whose domain to access
  * @return the domain of view in the queried dimensions
@@ -351,5 +315,4 @@ class ChunkCommon<ElementType, DiscreteDomain<DDims...>, LayoutStridedPolicy>
     }
 };
 
-
 } // namespace ddc

vendor/ddc/include/ddc/chunk_traits.hpp

@@ -0,0 +1,49 @@
+// Copyright (C) The DDC development team, see COPYRIGHT.md file
+//
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <type_traits>
+#include <utility>
+
+namespace ddc {
+
+template <class T>
+inline constexpr bool enable_borrowed_chunk = false;
+
+template <class T>
+inline constexpr bool enable_chunk = false;
+
+template <class T>
+inline constexpr bool is_chunk_v = enable_chunk<std::remove_const_t<std::remove_reference_t<T>>>;
+
+template <class T>
+inline constexpr bool is_borrowed_chunk_v
+        = is_chunk_v<
+                  T> && (std::is_lvalue_reference_v<T> || enable_borrowed_chunk<std::remove_cv_t<std::remove_reference_t<T>>>);
+
+template <class T>
+struct chunk_traits
+{
+    static_assert(is_chunk_v<T>);
+    using value_type
+            = std::remove_cv_t<std::remove_pointer_t<decltype(std::declval<T>().data_handle())>>;
+    using pointer_type = decltype(std::declval<T>().data_handle());
+    using reference_type = decltype(*std::declval<T>().data_handle());
+};
+
+template <class T>
+using chunk_value_t = typename chunk_traits<T>::value_type;
+
+template <class T>
+using chunk_pointer_t = typename chunk_traits<T>::pointer_type;
+
+template <class T>
+using chunk_reference_t = typename chunk_traits<T>::reference_type;
+
+template <class T>
+inline constexpr bool is_writable_chunk_v
+        = !std::is_const_v<std::remove_pointer_t<chunk_pointer_t<T>>>;
+
+} // namespace ddc

vendor/ddc/include/ddc/coordinate.hpp

@@ -4,7 +4,10 @@
 
 #pragma once
 
+#include <type_traits>
+
 #include "ddc/detail/tagged_vector.hpp"
+#include "ddc/discrete_element.hpp"
 #include "ddc/real_type.hpp"
 
 namespace ddc {
@@ -22,9 +25,24 @@ using CoordinateElement = Real;
 template <class... CDims>
 using Coordinate = detail::TaggedVector<CoordinateElement, CDims...>;
 
+template <class... DDim, std::enable_if_t<(sizeof...(DDim) > 1), int> = 0>
+KOKKOS_FUNCTION Coordinate<typename DDim::continuous_dimension_type...> coordinate(
+        DiscreteElement<DDim...> const& c)
+{
+    return Coordinate<typename DDim::continuous_dimension_type...>(
+            coordinate(DiscreteElement<DDim>(c))...);
+}
+
+// Gives access to the type of the coordinates of a discrete element
+// Example usage : "using Coords = coordinate_of_t<DElem>;"
 template <class T>
-struct coordinate_of;
+struct coordinate_of
+{
+    static_assert(is_discrete_element_v<T>, "Parameter T must be of type DiscreteElement");
+    using type = decltype(coordinate(std::declval<T>()));
+};
 
+/// Helper type of \ref ddc::coordinate_of
 template <class T>
 using coordinate_of_t = typename coordinate_of<T>::type;
 

vendor/ddc/include/ddc/ddc.hpp

@@ -15,10 +15,10 @@
 #include "ddc/aligned_allocator.hpp"
 #include "ddc/chunk.hpp"
 #include "ddc/chunk_span.hpp"
+#include "ddc/chunk_traits.hpp"
 #include "ddc/kokkos_allocator.hpp"
 
 // Discretizations
-#include "ddc/coordinate_md.hpp"
 #include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_space.hpp"

vendor/ddc/include/ddc/dual_discretization.hpp → vendor/ddc/include/ddc/detail/dual_discretization.hpp

@@ -16,7 +16,7 @@
 #include <hip/hip_runtime.h>
 #endif
 
-namespace ddc {
+namespace ddc::detail {
 
 template <class DDim>
 class DualDiscretization
@@ -80,4 +80,4 @@ class DualDiscretization
     }
 };
 
-} // namespace ddc
+} // namespace ddc::detail

vendor/ddc/include/ddc/detail/tagged_vector.hpp

@@ -21,17 +21,17 @@ template <class, class...>
 class TaggedVector;
 
 template <class T>
-struct IsTaggedVector : std::false_type
+struct is_tagged_vector : std::false_type
 {
 };
 
 template <class ElementType, class... Tags>
-struct IsTaggedVector<TaggedVector<ElementType, Tags...>> : std::true_type
+struct is_tagged_vector<TaggedVector<ElementType, Tags...>> : std::true_type
 {
 };
 
 template <class T>
-inline constexpr bool is_tagged_vector_v = IsTaggedVector<T>::value;
+inline constexpr bool is_tagged_vector_v = is_tagged_vector<T>::value;
 
 template <class ElementType, class... Tags>
 struct ToTypeSeq<TaggedVector<ElementType, Tags...>>
@@ -224,12 +224,12 @@ KOKKOS_FUNCTION constexpr auto const& take(
 
 
 template <class T>
-class ConversionOperators
+class TaggedVectorConversionOperators
 {
 };
 
 template <class ElementType, class Tag>
-class ConversionOperators<TaggedVector<ElementType, Tag>>
+class TaggedVectorConversionOperators<TaggedVector<ElementType, Tag>>
 {
 public:
     KOKKOS_FUNCTION constexpr operator ElementType const &() const noexcept
@@ -244,9 +244,9 @@ class ConversionOperators<TaggedVector<ElementType, Tag>>
 };
 
 template <class ElementType, class... Tags>
-class TaggedVector : public ConversionOperators<TaggedVector<ElementType, Tags...>>
+class TaggedVector : public TaggedVectorConversionOperators<TaggedVector<ElementType, Tags...>>
 {
-    friend class ConversionOperators<TaggedVector<ElementType, Tags...>>;
+    friend class TaggedVectorConversionOperators<TaggedVector<ElementType, Tags...>>;
 
     using tags_seq = detail::TypeSeq<Tags...>;
 

vendor/ddc/include/ddc/discrete_domain.hpp

@@ -23,17 +23,17 @@ template <class... DDims>
 class DiscreteDomain;
 
 template <class T>
-struct IsDiscreteDomain : std::false_type
+struct is_discrete_domain : std::false_type
 {
 };
 
 template <class... Tags>
-struct IsDiscreteDomain<DiscreteDomain<Tags...>> : std::true_type
+struct is_discrete_domain<DiscreteDomain<Tags...>> : std::true_type
 {
 };
 
 template <class T>
-inline constexpr bool is_discrete_domain_v = IsDiscreteDomain<T>::value;
+inline constexpr bool is_discrete_domain_v = is_discrete_domain<T>::value;
 
 
 namespace detail {

vendor/ddc/include/ddc/discrete_element.hpp

@@ -10,7 +10,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "ddc/coordinate.hpp"
 #include "ddc/detail/macros.hpp"
 #include "ddc/detail/type_seq.hpp"
 #include "ddc/discrete_vector.hpp"
@@ -21,17 +20,17 @@ template <class...>
 class DiscreteElement;
 
 template <class T>
-struct IsDiscreteElement : std::false_type
+struct is_discrete_element : std::false_type
 {
 };
 
 template <class... Tags>
-struct IsDiscreteElement<DiscreteElement<Tags...>> : std::true_type
+struct is_discrete_element<DiscreteElement<Tags...>> : std::true_type
 {
 };
 
 template <class T>
-inline constexpr bool is_discrete_element_v = IsDiscreteElement<T>::value;
+inline constexpr bool is_discrete_element_v = is_discrete_element<T>::value;
 
 
 namespace detail {
@@ -443,13 +442,4 @@ KOKKOS_FUNCTION constexpr DiscreteVector<Tags...> operator-(
     return DiscreteVector<Tags...>((uid<Tags>(lhs) - uid<Tags>(rhs))...);
 }
 
-// Gives access to the type of the coordinates of a discrete element
-// Example usage : "using Coords = coordinate_of_t<DElem>;"
-template <class... DDims>
-struct coordinate_of<ddc::DiscreteElement<DDims...>>
-{
-    // maybe a static_assert on DDims ?
-    using type = Coordinate<typename DDims::continuous_dimension_type...>;
-};
-
 } // namespace ddc

vendor/ddc/include/ddc/discrete_space.hpp

@@ -17,7 +17,9 @@
 
 #include <Kokkos_Core.hpp>
 
+#include "ddc/detail/dual_discretization.hpp"
 #include "ddc/detail/macros.hpp"
+
 #if defined(__CUDACC__)
 #include <sstream>
 
@@ -29,7 +31,6 @@
 #include <hip/hip_runtime.h>
 #endif
 
-#include "ddc/dual_discretization.hpp"
 
 namespace ddc {