pre commit

Larb-YasmineBadrElhouda · Larb-YasmineBadrElhouda · commit a284198a8938 · 2025-08-04T18:55:36.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -337,4 +337,4 @@ if(DETRAY_BUILD_TUTORIALS)
 endif()
 
 # Set up the packaging of the project.
-include(detray-packaging)
+include(detray-packaging)
diff --git a/cmake/detray-compiler-options-hip.cmake b/cmake/detray-compiler-options-hip.cmake
@@ -9,32 +9,39 @@ cmake_minimum_required(VERSION 3.21)
 if(PROJECT_IS_TOP_LEVEL)
     include(detray-functions)
 
-
     #find HIP
     find_package(HIP REQUIRED)
     # Basic flags for all build modes.
-    if( ( "${CMAKE_HIP_PLATFORM}" STREQUAL "hcc" ) OR
-        ( "${CMAKE_HIP_PLATFORM}" STREQUAL "amd" ) )
-       detray_add_flag( CMAKE_HIP_FLAGS "-Wall" )
-       detray_add_flag( CMAKE_HIP_FLAGS "-Wextra" )
-       detray_add_flag( CMAKE_HIP_FLAGS "-Wshadow" )
-       detray_add_flag( CMAKE_HIP_FLAGS "-Wunused-local-typedefs" )
-       detray_add_flag( CMAKE_HIP_FLAGS "-pedantic" )
+    if(
+        ("${CMAKE_HIP_PLATFORM}" STREQUAL "hcc")
+        OR ("${CMAKE_HIP_PLATFORM}" STREQUAL "amd")
+    )
+        detray_add_flag( CMAKE_HIP_FLAGS "-Wall" )
+        detray_add_flag( CMAKE_HIP_FLAGS "-Wextra" )
+        detray_add_flag( CMAKE_HIP_FLAGS "-Wshadow" )
+        detray_add_flag( CMAKE_HIP_FLAGS "-Wunused-local-typedefs" )
+        detray_add_flag( CMAKE_HIP_FLAGS "-pedantic" )
     endif()
     # Generate debug symbols for the device code as well in a debug build.
-    if( ( "${CMAKE_HIP_PLATFORM}" STREQUAL "nvcc" ) OR
-        ( "${CMAKE_HIP_PLATFORM}" STREQUAL "nvidia" ) )
-       detray_add_flag( CMAKE_HIP_FLAGS_DEBUG "-G" )
+    if(
+        ("${CMAKE_HIP_PLATFORM}" STREQUAL "nvcc")
+        OR ("${CMAKE_HIP_PLATFORM}" STREQUAL "nvidia")
+    )
+        detray_add_flag( CMAKE_HIP_FLAGS_DEBUG "-G" )
     endif()
 
     # Fail on warnings, if asked for that behaviour.
-    if( DETRAY_FAIL_ON_WARNINGS )
-       if( ( "${CMAKE_HIP_PLATFORM}" STREQUAL "hcc" ) OR
-           ( "${CMAKE_HIP_PLATFORM}" STREQUAL "amd" ) )
-          detray_add_flag( CMAKE_HIP_FLAGS "-Werror" )
-       elseif( ( "${CMAKE_HIP_PLATFORM}" STREQUAL "nvcc" ) OR
-               ( "${CMAKE_HIP_PLATFORM}" STREQUAL "nvidia" ) )
-          detray_add_flag( CMAKE_HIP_FLAGS "-Werror all-warnings" )
-       endif()
+    if(DETRAY_FAIL_ON_WARNINGS)
+        if(
+            ("${CMAKE_HIP_PLATFORM}" STREQUAL "hcc")
+            OR ("${CMAKE_HIP_PLATFORM}" STREQUAL "amd")
+        )
+            detray_add_flag( CMAKE_HIP_FLAGS "-Werror" )
+        elseif(
+            ("${CMAKE_HIP_PLATFORM}" STREQUAL "nvcc")
+            OR ("${CMAKE_HIP_PLATFORM}" STREQUAL "nvidia")
+        )
+            detray_add_flag( CMAKE_HIP_FLAGS "-Werror all-warnings" )
+        endif()
     endif()
 endif()
diff --git a/core/include/detray/definitions/detail/hip_definitions.hpp b/core/include/detray/definitions/detail/hip_definitions.hpp
@@ -9,28 +9,27 @@
 
 #if defined(__HIPCC__)
 
+#include <assert.h>
 #include <hip/hip_runtime.h>
-#include <hip/hip_runtime_api.h>   // for hipDeviceSynchronize, hipGetLastError
-
+#include <hip/hip_runtime_api.h>  // for hipDeviceSynchronize, hipGetLastError
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 /// Number of threads per Warp
 #define WARP_SIZE 32
 
 /// Helper macro used for checking  , type return values.
-        
+
 #define DETRAY_HIP_ERROR_CHECK(ans) \
-    { hipAssert((ans) , __FILE__ , __LINE__); }
-inline void hipAssert( hipError_t code , const char *file , int line,
-                       bool abort = true ) {
+    { hipAssert((ans), __FILE__, __LINE__); }
+inline void hipAssert(hipError_t code, const char *file, int line,
+                      bool abort = true) {
     if (code != hipSuccess) {
-        fprintf(stderr, "HIPassert: %s %s %d\n", hipGetErrorString(code),
-                file, line);
+        fprintf(stderr, "HIPassert: %s %s %d\n", hipGetErrorString(code), file,
+                line);
         if (abort)
             exit(code);
     }
 }
 
-#endif
+#endif
diff --git a/core/include/detray/utils/bounding_volume.hpp b/core/include/detray/utils/bounding_volume.hpp
@@ -301,8 +301,7 @@ class axis_aligned_bounding_volume {
     /// Checks whether a point lies inside the box. The point has to be defined
     /// in the coordinate frame that is spanned by the box axes.
     template <concepts::point point_t>
-    DETRAY_HOST_DEVICE
-    constexpr bool is_inside(
+    DETRAY_HOST_DEVICE constexpr bool is_inside(
         const point_t& loc_p,
         const scalar_t t = std::numeric_limits<scalar_t>::epsilon()) const {
         return m_mask.is_inside(loc_p, t);
diff --git a/extern/covfie/CMakeLists.txt b/extern/covfie/CMakeLists.txt
@@ -52,8 +52,6 @@ set(COVFIE_PLATFORM_CUDA
     "Enable covfie CUDA platform"
 )
 
-
-
 set(COVFIE_REQUIRE_CXX20 OFF CACHE BOOL "Enable covfie C++20 requirement")
 set(COVFIE_QUIET ON CACHE BOOL "Quiet covfie feature warnings")
 
diff --git a/tests/include/detray/test/device/CMakeLists.txt b/tests/include/detray/test/device/CMakeLists.txt
@@ -23,4 +23,4 @@ endif()
 
 if(DETRAY_BUILD_HIP)
     add_subdirectory(hip)
-endif()
+endif()
diff --git a/tests/include/detray/test/device/hip/CMakeLists.txt b/tests/include/detray/test/device/hip/CMakeLists.txt
@@ -5,7 +5,7 @@
 # Mozilla Public License Version 2.0
 
 # C++17 support for HIP requires CMake 3.21.
-cmake_minimum_required(VERSION 3.21) # HIP langauge support requires minimum 3.21 
+cmake_minimum_required(VERSION 3.21) # HIP langauge support requires minimum 3.21
 
 # Enable HIP as a language.
 enable_language(HIP)
diff --git a/tests/include/detray/test/device/hip/material_validation.hpp b/tests/include/detray/test/device/hip/material_validation.hpp
@@ -72,7 +72,7 @@ struct run_material_validation {
 
         // Move the track parameters to device
         auto tracks_buffer = hip_cpy.to(vecmem::get_data(tracks), *dev_mr,
-                                         vecmem::copy::type::host_to_device);
+                                        vecmem::copy::type::host_to_device);
         vecmem::data::vector_view<track_t> tracks_view =
             vecmem::get_data(tracks_buffer);
 
diff --git a/tests/include/detray/test/device/hip/navigation_validation.hpp b/tests/include/detray/test/device/hip/navigation_validation.hpp
@@ -92,7 +92,7 @@ inline auto run_navigation_validation(
         vecmem::get_data(truth_intersection_traces, host_mr);
     auto truth_intersection_traces_buffer =
         hip_cpy.to(truth_intersection_traces_data, *dev_mr, host_mr,
-                    vecmem::copy::type::host_to_device);
+                   vecmem::copy::type::host_to_device);
     vecmem::data::jagged_vector_view<const intersection_record_t>
         truth_intersection_traces_view =
             vecmem::get_data(truth_intersection_traces_buffer);
diff --git a/tests/integration_tests/device/CMakeLists.txt b/tests/integration_tests/device/CMakeLists.txt
@@ -14,4 +14,4 @@ endif()
 
 if(DETRAY_BUILD_HIP)
     add_subdirectory(hip)
-endif()
+endif()
diff --git a/tests/integration_tests/device/hip/CMakeLists.txt b/tests/integration_tests/device/hip/CMakeLists.txt
@@ -4,13 +4,12 @@
 #
 # Mozilla Public License Version 2.0
 
-#----------------------------- no errrors 
+#----------------------------- no errrors
 message(STATUS "Building detray HIP integration tests")
 
-#HIP langauge support requires minimum 3.21 
+#HIP langauge support requires minimum 3.21
 cmake_minimum_required(VERSION 3.21)
 
-
 #set(CMAKE_HIP_COMPILER_FORCED TRUE)
 #set(CMAKE_HIP_STANDARD_COMPUTED_DEFAULT 17)
 # Enable HIP as a language.
@@ -19,8 +18,7 @@ enable_language(HIP)
 # Set the HIP build flags.
 include(detray-compiler-options-hip)
 
-#--------------------------------------------- 
-
+#---------------------------------------------
 
 # make unit tests for multiple algebras
 # Currently vc and smatrix is not supported
@@ -30,17 +28,15 @@ if(DETRAY_EIGEN_PLUGIN)
     list(APPEND algebras "eigen")
 endif()
 
-
 # error in covfie::hip : No known features for HIP compiler "AMD" Version 6.....
 
-
 foreach(algebra ${algebras})
     # Unit tests for the selected algebra.
     detray_add_integration_test(hip_${algebra}
        "propagator_hip_kernel.hpp"
        "propagator_hip.hip"
        "propagator_hip_kernel.hip"
-       LINK_LIBRARIES GTest::gtest_main vecmem::hip #covfie::hip 
+       LINK_LIBRARIES GTest::gtest_main vecmem::hip #covfie::hip
                        detray::core detray::algebra_${algebra} detray::test_hip
                        detray::test_common
     )
@@ -56,5 +52,3 @@ foreach(algebra ${algebras})
             DEPENDS "detray_unit_test_hip;detray_unit_test_hip_${algebra}"
     )
 endforeach()
-
-
diff --git a/tests/integration_tests/device/hip/propagator_hip.hip b/tests/integration_tests/device/hip/propagator_hip.hip
@@ -179,6 +179,6 @@ TEST(HipPropagatorValidation9, inhomogeneous_bfield_cpy) {
 
     //run_propagation_test<bfield::hip::inhom_bknd_t>(
     //    &mng_mr, det, cfg, detray::get_data(det_buff), std::move(field));
-    
+
 }
-*/
+*/
diff --git a/tests/integration_tests/device/hip/propagator_hip_kernel.hpp b/tests/integration_tests/device/hip/propagator_hip_kernel.hpp
@@ -20,16 +20,15 @@
 
 // Covfie include(s)
 
-//we can include it after solving the linking problem - covfie::hip in the cake file 
-//#include <covfie/hip/backend/primitive/hip_device_array.hpp>  // error
+// we can include it after solving the linking problem - covfie::hip in the cake
+// file #include <covfie/hip/backend/primitive/hip_device_array.hpp>  // error
 
 namespace detray {
 
 using scalar = test::scalar;
 
-
-
-// this namespace - dependance with covfie -> cannot run it until solving the covfie::hip 
+// this namespace - dependance with covfie -> cannot run it until solving the
+// covfie::hip
 
 /*namespace bfield::hip {
 
@@ -43,8 +42,6 @@ using inhom_bknd_t = covfie::backend::affine<covfie::backend::linear<
 
 */
 
-
-
 /// Launch the propagation test kernel
 template <typename bfield_bknd_t, typename detector_t>
 void propagator_test(
diff --git a/tests/unit_tests/device/hip/detector_hip.hip b/tests/unit_tests/device/hip/detector_hip.hip
@@ -29,8 +29,8 @@ using namespace detray;
 TEST(detector_hip, detector) {
 
     // memory resource
-    vecmem::hip::managed_memory_resource mng_mr; 
-    
+    vecmem::hip::managed_memory_resource mng_mr;
+
 
     // create toy geometry
     auto [toy_det, names] = build_toy_detector<test::algebra>(mng_mr);
@@ -46,7 +46,7 @@ TEST(detector_hip, detector) {
     auto& cylinders_host = masks_host.get<cylinder_id>();
     auto& rectangles_host = masks_host.get<rectangle_id>();
 
-    // copied outputs from device side 
+    // copied outputs from device side
     vecmem::vector<det_volume_t> volumes_device(volumes_host.size(), &mng_mr);
     vecmem::vector<det_surface_t> surfaces_device(surfaces_host.size(),
                                                   &mng_mr);
@@ -71,7 +71,7 @@ TEST(detector_hip, detector) {
     // run the test code to copy the objects
     detector_test(toy_det_data, volumes_data, surfaces_data, transforms_data,
                   rectangles_data, discs_data, cylinders_data);
-    
+
     // check if the same volume objects are copied
     for (unsigned int i = 0u; i < volumes_host.size(); i++) {
         EXPECT_EQ(volumes_host[i] == volumes_device[i], true);
@@ -100,4 +100,3 @@ TEST(detector_hip, detector) {
         EXPECT_EQ(cylinders_host[i] == cylinders_device[i], true);
     }
 }
-
diff --git a/tests/unit_tests/device/hip/detector_hip_kernel.hip b/tests/unit_tests/device/hip/detector_hip_kernel.hip
@@ -4,8 +4,8 @@
  *
  * Mozilla Public License Version 2.0
  */
- 
-#include "detray/definitions/detail/hip_definitions.hpp"  
+
+#include "detray/definitions/detail/hip_definitions.hpp"
 #include "detray/geometry/tracking_surface.hpp"
 
 // Detray test include(s)
@@ -74,7 +74,7 @@ __global__ void detector_test_kernel(
     }
 
 
-} 
+}
 
 /// implementation of the test function for detector
 void detector_test(typename detector_host_t::view_type det_data,
@@ -83,7 +83,7 @@ void detector_test(typename detector_host_t::view_type det_data,
                    vecmem::data::vector_view<transform_t> transforms_data,
                    vecmem::data::vector_view<rectangle_t> rectangles_data,
                    vecmem::data::vector_view<disc_t> discs_data,
-                   vecmem::data::vector_view<cylinder_t> cylinders_data) { 
+                   vecmem::data::vector_view<cylinder_t> cylinders_data) {
 
 
     constexpr int block_dim = 1u;
@@ -93,9 +93,9 @@ void detector_test(typename detector_host_t::view_type det_data,
         det_data, volumes_data, surfaces_data, transforms_data, rectangles_data,
         discs_data, cylinders_data);
     // HIP error check
-    DETRAY_HIP_ERROR_CHECK(hipGetLastError()); 
+    DETRAY_HIP_ERROR_CHECK(hipGetLastError());
 
-    DETRAY_HIP_ERROR_CHECK(hipDeviceSynchronize()); 
+    DETRAY_HIP_ERROR_CHECK(hipDeviceSynchronize());
 
 }
 }
diff --git a/tests/unit_tests/device/hip/detector_hip_kernel.hpp b/tests/unit_tests/device/hip/detector_hip_kernel.hpp
@@ -44,5 +44,4 @@ void detector_test(typename detector_host_t::view_type det_data,
                    vecmem::data::vector_view<disc_t> discs_data,
                    vecmem::data::vector_view<cylinder_t> cylinders_data);
 
-
 }  // namespace detray

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ set(COVFIE_PLATFORM_CUDA`
`52`	`52`	`"Enable covfie CUDA platform"`
`53`	`53`	`)`
`54`	`54`
`55`		`-`
`56`		`-`
`57`	`55`	`set(COVFIE_REQUIRE_CXX20 OFF CACHE BOOL "Enable covfie C++20 requirement")`
`58`	`56`	`set(COVFIE_QUIET ON CACHE BOOL "Quiet covfie feature warnings")`
`59`	`57`