Merge pull request #925 from niermann999/ref-algebra-detail

ref: move some includes out of the detail namespace

Author: asalzburger

core/include/detray/builders/cuboid_portal_generator.hpp

@@ -10,10 +10,10 @@
 // Project include(s)
 #include "detray/builders/surface_factory_interface.hpp"
 #include "detray/core/detail/data_context.hpp"
-#include "detray/definitions/detail/indexing.hpp"
-#include "detray/definitions/detail/math.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/definitions/geometry.hpp"
+#include "detray/definitions/indexing.hpp"
+#include "detray/definitions/math.hpp"
 #include "detray/geometry/shapes/cuboid3D.hpp"
 #include "detray/utils/bounding_volume.hpp"
 

core/include/detray/builders/cylinder_portal_generator.hpp

@@ -11,10 +11,10 @@
 #include "detray/builders/surface_factory_interface.hpp"
 #include "detray/builders/volume_builder.hpp"
 #include "detray/core/detail/data_context.hpp"
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/indexing.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/definitions/geometry.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/geometry/shapes/cuboid3D.hpp"
 #include "detray/utils/bounding_volume.hpp"
 

core/include/detray/builders/detail/associator.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Project include(s).
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/math.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/math.hpp"
 #include "detray/utils/concepts.hpp"
 
 // System include(s).

core/include/detray/builders/detail/bin_association.hpp

@@ -10,7 +10,7 @@
 
 // Project include(s)
 #include "detray/builders/detail/associator.hpp"
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/units.hpp"
 #include "detray/geometry/coordinates/concentric_cylindrical2D.hpp"
 #include "detray/geometry/coordinates/cylindrical2D.hpp"

core/include/detray/builders/detail/portal_accessor.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s).
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/geometry/shapes/cylinder2D.hpp"
 #include "detray/geometry/shapes/ring2D.hpp"

core/include/detray/builders/detail/volume_connector.hpp

@@ -8,8 +8,8 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/containers.hpp"
-#include "detray/definitions/detail/indexing.hpp"
+#include "detray/definitions/containers.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/materials/predefined_materials.hpp"
 
 // Vecmem include(s)

core/include/detray/builders/grid_factory.hpp

@@ -8,8 +8,8 @@
 #pragma once
 
 // Project include(s).
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/containers.hpp"
+#include "detray/definitions/algebra.hpp"
+#include "detray/definitions/containers.hpp"
 #include "detray/definitions/units.hpp"
 #include "detray/geometry/mask.hpp"
 #include "detray/geometry/shapes.hpp"

core/include/detray/builders/homogeneous_material_factory.hpp

@@ -9,8 +9,8 @@
 
 // Project include(s)
 #include "detray/builders/surface_factory.hpp"
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/indexing.hpp"
+#include "detray/definitions/algebra.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/geometry/shapes/unmasked.hpp"
 #include "detray/materials/material.hpp"
 #include "detray/utils/ranges.hpp"

core/include/detray/builders/homogeneous_material_generator.hpp

@@ -9,9 +9,9 @@
 
 // Project include(s)
 #include "detray/builders/surface_factory_interface.hpp"
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/indexing.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/materials/material.hpp"
 #include "detray/materials/material_rod.hpp"
 #include "detray/materials/predefined_materials.hpp"

core/include/detray/builders/material_map_factory.hpp

@@ -10,7 +10,7 @@
 // Project include(s)
 #include "detray/builders/homogeneous_material_factory.hpp"
 #include "detray/builders/surface_factory.hpp"
-#include "detray/definitions/detail/indexing.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/geometry/shapes/unmasked.hpp"
 #include "detray/materials/material.hpp"
 #include "detray/utils/ranges.hpp"

core/include/detray/builders/material_map_generator.hpp

@@ -9,9 +9,9 @@
 
 // Project include(s)
 #include "detray/builders/surface_factory_interface.hpp"
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/indexing.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/geometry/detail/surface_kernels.hpp"
 #include "detray/geometry/shapes/cylinder2D.hpp"
 #include "detray/geometry/shapes/ring2D.hpp"

core/include/detray/builders/surface_factory.hpp

@@ -10,8 +10,8 @@
 // Project include(s)
 #include "detray/builders/surface_factory_interface.hpp"
 #include "detray/core/detail/data_context.hpp"
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/geometry/mask.hpp"
 #include "detray/geometry/shapes/unmasked.hpp"
 #include "detray/materials/material_rod.hpp"

core/include/detray/builders/surface_factory_interface.hpp

@@ -13,9 +13,9 @@
 #endif
 
 // Project include(s).
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/definitions/geometry.hpp"
+#include "detray/definitions/indexing.hpp"
 
 // System include(s)
 #include <memory>

core/include/detray/core/detail/container_buffers.hpp

@@ -9,7 +9,7 @@
 
 // Project include(s)
 #include "detray/core/detail/container_views.hpp"
-#include "detray/definitions/detail/containers.hpp"
+#include "detray/definitions/containers.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/utils/tuple.hpp"
 #include "detray/utils/tuple_helpers.hpp"

core/include/detray/core/detail/container_views.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/containers.hpp"
+#include "detray/definitions/containers.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/utils/tuple.hpp"
 #include "detray/utils/tuple_helpers.hpp"

core/include/detray/core/detail/data_context.hpp

@@ -8,8 +8,8 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 
 namespace detray {
 

core/include/detray/core/detail/indexing.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/containers.hpp"
+#include "detray/definitions/containers.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/utils/bit_encoder.hpp"
 #include "detray/utils/invalid_values.hpp"

core/include/detray/core/detail/multi_store.hpp

@@ -12,8 +12,8 @@
 #include "detray/core/detail/container_views.hpp"
 #include "detray/core/detail/data_context.hpp"
 #include "detray/core/detail/tuple_container.hpp"
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/utils/type_list.hpp"
 #include "detray/utils/type_registry.hpp"
 #include "detray/utils/type_traits.hpp"

core/include/detray/core/detail/single_store.hpp

@@ -11,8 +11,8 @@
 #include "detray/core/detail/container_buffers.hpp"
 #include "detray/core/detail/container_views.hpp"
 #include "detray/core/detail/data_context.hpp"
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 
 // Vecmem include(s)
 #include <vecmem/memory/memory_resource.hpp>

core/include/detray/core/detail/surface_lookup.hpp

@@ -10,8 +10,8 @@
 // Project include(s)
 #include "detray/core/detail/container_buffers.hpp"
 #include "detray/core/detail/container_views.hpp"
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/geometry/barcode.hpp"
 
 // Vecmem include(s)

core/include/detray/core/detail/tuple_container.hpp

@@ -10,7 +10,7 @@
 // Detray include(s)
 #include "detray/core/detail/container_buffers.hpp"
 #include "detray/core/detail/container_views.hpp"
-#include "detray/definitions/detail/containers.hpp"
+#include "detray/definitions/containers.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/utils/tuple_helpers.hpp"
 #include "detray/utils/type_traits.hpp"

core/include/detray/core/detector.hpp

@@ -16,8 +16,8 @@
 #include "detray/core/detail/container_buffers.hpp"
 #include "detray/core/detail/container_views.hpp"
 #include "detray/core/detail/surface_lookup.hpp"
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/containers.hpp"
+#include "detray/definitions/algebra.hpp"
+#include "detray/definitions/containers.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/geometry/detail/volume_descriptor.hpp"
 #include "detray/utils/concepts.hpp"

core/include/detray/definitions/detail/algebra.hpp core/include/detray/definitions/algebra.hpp

@@ -16,7 +16,7 @@
 // System include(s)
 #include <algorithm>
 
-namespace detray::detail {
+namespace detray {
 
 /// @brief sequential (single thread) sort function
 template <std::random_access_iterator rand_iter_t,
@@ -25,7 +25,7 @@ DETRAY_HOST_DEVICE inline void sequential_sort(rand_iter_t first,
                                                sentinel_t last) {
 #if defined(__CUDACC__) || defined(CL_SYCL_LANGUAGE_VERSION) || \
     defined(SYCL_LANGUAGE_VERSION)
-    detray::selection_sort(first, last);
+    detray::detail::selection_sort(first, last);
 #else
     std::ranges::sort(first, last);
 #endif
@@ -52,7 +52,7 @@ DETRAY_HOST_DEVICE inline auto lower_bound(forw_iter_t first, sentinel_t last,
                                            const Value& value) {
 #if defined(__CUDACC__) || defined(CL_SYCL_LANGUAGE_VERSION) || \
     defined(SYCL_LANGUAGE_VERSION)
-    return detray::lower_bound(first, last, value);
+    return detray::detail::lower_bound(first, last, value);
 #else
     return std::ranges::lower_bound(first, last, value);
 #endif
@@ -65,10 +65,10 @@ DETRAY_HOST_DEVICE inline auto upper_bound(forw_iter_t first, sentinel_t last,
                                            const Value& value) {
 #if defined(__CUDACC__) || defined(CL_SYCL_LANGUAGE_VERSION) || \
     defined(SYCL_LANGUAGE_VERSION)
-    return detray::upper_bound(first, last, value);
+    return detray::detail::upper_bound(first, last, value);
 #else
     return std::ranges::upper_bound(first, last, value);
 #endif
 }
 
-}  // namespace detray::detail
+}  // namespace detray

core/include/detray/definitions/detail/algorithms.hpp core/include/detray/definitions/algorithms.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Algebra-plugins include(s)
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 
 // SYCL include(s).
 #if defined(CL_SYCL_LANGUAGE_VERSION) || defined(SYCL_LANGUAGE_VERSION)

core/include/detray/definitions/detail/containers.hpp core/include/detray/definitions/containers.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s).
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/definitions/units.hpp"
 

core/include/detray/definitions/detail/indexing.hpp core/include/detray/definitions/indexing.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/utils/concepts.hpp"
 
 namespace detray {

core/include/detray/definitions/detail/math.hpp core/include/detray/definitions/math.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 
 // System include(s)
 #include <cmath>

core/include/detray/definitions/pdg_particle.hpp

@@ -9,9 +9,9 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/indexing.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/definitions/geometry.hpp"
+#include "detray/definitions/indexing.hpp"
 #include "detray/utils/bit_encoder.hpp"
 
 // System include(s)

core/include/detray/definitions/track_parametrization.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 
 namespace detray {

core/include/detray/definitions/units.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 
 namespace detray {

core/include/detray/geometry/barcode.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/math.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/math.hpp"
 
 namespace detray {
 

core/include/detray/geometry/coordinates/cartesian2D.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/math.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/math.hpp"
 
 namespace detray {
 

core/include/detray/geometry/coordinates/cartesian3D.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/math.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/math.hpp"
 
 namespace detray {
 

core/include/detray/geometry/coordinates/concentric_cylindrical2D.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/math.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/math.hpp"
 
 namespace detray {
 

core/include/detray/geometry/coordinates/cylindrical2D.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/algebra.hpp"
-#include "detray/definitions/detail/math.hpp"
+#include "detray/definitions/algebra.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
+#include "detray/definitions/math.hpp"
 
 namespace detray {