fix: Further fixes to detray plugin

This commit makes several minor changes to the detray plugin: 1. It adds the detray plugin to the downstream project. 2. It disables the build of the detray CUDA code, which we don't need.
acts-project · Aug 29, 2024 · 541712c · 541712c
1 parent 4569230
commit 541712c
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 46 deletions.
diff --git a/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConverter.hpp b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConverter.hpp
@@ -38,53 +38,10 @@ class DetrayConverter {
   /// @param options the conversion options
   ///
   /// @returns a detector of requested return type
-  template <typename detector_t = DetrayDetector>
-  detector_t convert(
+  DetrayDetector convert(
       const GeometryContext& gctx, const Detector& detector,
       vecmem::memory_resource& mr,
-      [[maybe_unused]] const DetrayConversionUtils::Options& options = {}) {
-    // The building cache object
-    DetrayConversionUtils::GeometryIdCache geoIdCache;
-
-    typename detector_t::name_map names = {{0u, detector.name()}};
-
-    // build detector
-    detray::detector_builder<typename detector_t::metadata> detectorBuilder{};
-    // (1) geometry
-    detray::io::detector_payload detectorPayload =
-        DetrayGeometryConverter::convertDetector(geoIdCache, gctx, detector,
-                                                 logger());
-    detray::io::geometry_reader::convert<detector_t>(detectorBuilder, names,
-                                                     detectorPayload);
-    // (2) material
-    if constexpr (detray::detail::has_material_grids_v<detector_t>) {
-      if (options.convertMaterial) {
-        detray::io::detector_grids_payload<detray::io::material_slab_payload,
-                                           detray::io::material_id>
-            materialPayload =
-                DetrayMaterialConverter::convertSurfaceMaterialGrids(
-                    geoIdCache, detector, logger());
-        detray::io::material_map_reader<>::convert<detector_t>(
-            detectorBuilder, names, materialPayload);
-      }
-    }
-
-    detector_t detrayDetector(detectorBuilder.build(mr));
-
-    // Checks and print
-    detray::detail::check_consistency(detrayDetector);
-
-    // If configured, write the detector to json
-    if (options.writeToJson) {
-      // Create a writer configuration and write it out
-      detray::io::detector_writer_config writerConfig{};
-      writerConfig.m_write_material = options.convertMaterial;
-      writerConfig.m_write_grids = options.convertSurfaceGrids;
-      writeToJson(detrayDetector, names, writerConfig);
-    }
-
-    return detrayDetector;
-  }
+      [[maybe_unused]] const DetrayConversionUtils::Options& options = {});
 
   /// Write the detector to json output
   ///

diff --git a/Plugins/Detray/src/DetrayConverter.cpp b/Plugins/Detray/src/DetrayConverter.cpp
@@ -19,3 +19,50 @@ void Acts::DetrayConverter::writeToJson(
   writer_cfg.format(detray::io::format::json);
   detray::io::write_detector(dDetector, names, writer_cfg);
 }
+
+Acts::DetrayDetector Acts::DetrayConverter::convert(
+    const GeometryContext& gctx, const Detector& detector,
+    vecmem::memory_resource& mr,
+    [[maybe_unused]] const DetrayConversionUtils::Options& options) {
+  // The building cache object
+  DetrayConversionUtils::GeometryIdCache geoIdCache;
+
+  DetrayDetector::name_map names = {{0u, detector.name()}};
+
+  // build detector
+  detray::detector_builder<DetrayDetector::metadata> detectorBuilder{};
+  // (1) geometry
+  detray::io::detector_payload detectorPayload =
+      DetrayGeometryConverter::convertDetector(geoIdCache, gctx, detector,
+                                               logger());
+  detray::io::geometry_reader::convert<DetrayDetector>(detectorBuilder, names,
+                                                       detectorPayload);
+  // (2) material
+  if constexpr (detray::detail::has_material_grids_v<DetrayDetector>) {
+    if (options.convertMaterial) {
+      detray::io::detector_grids_payload<detray::io::material_slab_payload,
+                                         detray::io::material_id>
+          materialPayload =
+              DetrayMaterialConverter::convertSurfaceMaterialGrids(
+                  geoIdCache, detector, logger());
+      detray::io::material_map_reader<>::convert<DetrayDetector>(
+          detectorBuilder, names, std::move(materialPayload));
+    }
+  }
+
+  DetrayDetector detrayDetector(detectorBuilder.build(mr));
+
+  // Checks and print
+  detray::detail::check_consistency(detrayDetector);
+
+  // If configured, write the detector to json
+  if (options.writeToJson) {
+    // Create a writer configuration and write it out
+    detray::io::detector_writer_config writerConfig{};
+    writerConfig.m_write_material = options.convertMaterial;
+    writerConfig.m_write_grids = options.convertSurfaceGrids;
+    writeToJson(detrayDetector, names, writerConfig);
+  }
+
+  return detrayDetector;
+}
diff --git a/Tests/DownstreamProject/CMakeLists.txt b/Tests/DownstreamProject/CMakeLists.txt
@@ -7,7 +7,14 @@ find_package(
     Acts
     CONFIG
     REQUIRED
-    COMPONENTS Core Fatras PluginJson PluginLegacy PluginTGeo PluginCovfie
+    COMPONENTS
+        Core
+        Fatras
+        PluginJson
+        PluginLegacy
+        PluginTGeo
+        PluginCovfie
+        PluginDetray
 )
 
 # place artifacts in GNU-like paths, e.g. binaries in `<build>/bin`
@@ -31,6 +38,7 @@ target_link_libraries(
         ActsPluginLegacy
         ActsPluginTGeo
         ActsPluginCovfie
+        ActsPluginDetray
 )
 
 option(DD4HEP "Build with DD4hep" ON)

diff --git a/thirdparty/detray/CMakeLists.txt b/thirdparty/detray/CMakeLists.txt
@@ -30,6 +30,11 @@ set(DETRAY_CUSTOM_SCALARTYPE
     "Scalar type to use in the Detray code"
 )
 
+set(DETRAY_BUILD_CUDA
+    OFF
+    CACHE BOOL
+    "Turn off the build of the Detray CUDA code"
+)
 set(DETRAY_BUILD_TESTING
     OFF
     CACHE BOOL