Restructure test directories

Author: niermann999

CMakeLists.txt

@@ -264,7 +264,14 @@ if(DETRAY_SETUP_BENCHMARK)
 endif()
 
 # Set up covfie.
-option(DETRAY_SETUP_COVFIE "Set up the covfie target(s) explicitly" TRUE)
+if(DETRAY_BUILD_TESTING OR DETRAY_BUILD_BENCHMARKS OR DETRAY_BUILD_CLI_TOOLS)
+    set(DETRAY_BUILD_COVFIE ON)
+endif()
+option(
+    DETRAY_SETUP_COVFIE
+    "Set up the covfie target(s) explicitly"
+    ${DETRAY_BUILD_COVFIE}
+)
 option(
     DETRAY_USE_SYSTEM_COVFIE
     "Pick up an existing installation of covfie from the build environment"

detectors/CMakeLists.txt

@@ -20,7 +20,7 @@ file(
 detray_add_library( detray_detectors detectors ${_detray_detectors_headers})
 target_link_libraries(
     detray_detectors
-    INTERFACE covfie::core vecmem::core detray::core detray::io
+    INTERFACE vecmem::core detray::core detray::io
 )
 
 unset(_detray_detector_headers)

io/CMakeLists.txt

@@ -23,7 +23,6 @@ file(
     RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
     "include/detray/io/backend/*.hpp"
     "include/detray/io/backend/detail/*.hpp"
-    "include/detray/io/covfie/*.hpp"
     "include/detray/io/frontend/*.hpp"
     "include/detray/io/frontend/detail/*.hpp"
     "include/detray/io/frontend/impl/*.hpp"
@@ -38,7 +37,6 @@ target_link_libraries(
     INTERFACE
         nlohmann_json::nlohmann_json
         vecmem::core
-        covfie::core
         detray::core
         detray::io_utils
 )

io/include/detray/io/backend/detail/grid_reader.hpp

@@ -403,7 +403,7 @@ class grid_reader {
                     }
                     entry.set_volume(volume_idx);
                     entry.set_index(static_cast<dindex>(c));
-                    vgr_builder->get().template populate<attach<>>(mbin, entry);
+                    grid.template populate<attach<>>(mbin, entry);
                 }
             }
         } else {

io/include/detray/io/covfie/read_bfield.hpp

@@ -19,7 +19,7 @@ detray_add_library( detray_svgtools svgtools
 )
 target_link_libraries(
     detray_svgtools
-    INTERFACE detray::core actsvg::core actsvg::meta
+    INTERFACE detray::core detray::io actsvg::core actsvg::meta
 )
 
 # Clean up.

plugins/svgtools/CMakeLists.txt

@@ -4,8 +4,6 @@
 #
 # Mozilla Public License Version 2.0
 
-message(STATUS "Building 'detray::test_utils' component")
-
 # Set the common C++ flags.
 include(detray-compiler-options-cpp)
 
@@ -14,37 +12,84 @@ include_directories(
     $<TARGET_PROPERTY:covfie::core,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
-# Set up a test library, which can be used by downstream projects without
-# building the detray unit and integration
+# Detray unit and integration test framework (depends on google test)
+if(DETRAY_BUILD_TESTING)
+    message(STATUS "Building 'detray::test_framework' component")
+
+    file(
+        GLOB _detray_test_headers
+        RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+        "include/detray/test/framework/*.hpp"
+    )
+
+    add_library(detray_test_framework INTERFACE "${_detray_test_headers}")
+    add_library(detray::test_framework ALIAS detray_test_framework)
+
+    target_include_directories(
+        detray_test_framework
+        INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    )
+
+    target_link_libraries(
+        detray_test_framework
+        INTERFACE GTest::gtest vecmem::core detray::core detray::detectors
+    )
+
+    unset(_detray_test_headers)
+endif()
+
+# Common test dependencies such as test detectors, B-fields and track generators
+# (depends on covfie)
 if(DETRAY_BUILD_TEST_UTILS)
+    message(STATUS "Building 'detray::test_common' component")
+
+    file(
+        GLOB _detray_test_common_headers
+        RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+        "include/detray/test/common/*.hpp"
+        "include/detray/test/common/factories/*.hpp"
+        "include/detray/test/common/event_generator/*.hpp"
+    )
+
+    detray_add_library(detray_test_common test_common "${_detray_test_common_headers}")
+
+    target_link_libraries(
+        detray_test_common
+        INTERFACE vecmem::core covfie::core detray::core detray::detectors
+    )
+
+    unset(_detray_test_common_headers)
+endif()
+
+# Lightweight test utils library without external dependencies
+if(DETRAY_BUILD_TEST_UTILS OR DETRAY_BUILD_VALIDATION_TOOLS)
+    message(STATUS "Building 'detray::test_utils' component")
+
     file(
         GLOB _detray_test_utils_headers
         RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
         "include/detray/test/utils/*.hpp"
-        "include/detray/test/utils/detectors/*.hpp"
-        "include/detray/test/utils/detectors/factories/*.hpp"
-        "include/detray/test/utils/simulation/event_generator/*.hpp"
-        "include/detray/test/utils/simulation/*.hpp"
     )
 
     detray_add_library(detray_test_utils test_utils ${_detray_test_utils_headers})
-    target_link_libraries(
-        detray_test_utils
-        INTERFACE vecmem::core detray::core detray::detectors
-    )
+
+    target_link_libraries(detray_test_utils INTERFACE vecmem::core detray::core)
 
     unset(_detray_test_utils_headers)
 endif()
 
-# Build extended validation tools
+# Build extended validation tools (actsvg and csv depencies)
 if(DETRAY_BUILD_VALIDATION_TOOLS)
+    message(STATUS "Building 'detray::validation_utils' component")
+
     file(
         GLOB _detray_validation_headers
         RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
         "include/detray/test/validation/*.hpp"
     )
 
     detray_add_library(detray_validation_utils validation_utils ${_detray_validation_headers})
+
     target_link_libraries(
         detray_validation_utils
         INTERFACE
@@ -58,33 +103,6 @@ if(DETRAY_BUILD_VALIDATION_TOOLS)
     unset(_detray_validation_headers)
 endif()
 
-# Build the common (host and device) test library (mostly for integration tests)
-if(DETRAY_BUILD_TESTING)
-    message(STATUS "Building 'detray::test_common' component")
-
-    file(
-        GLOB _detray_test_headers
-        RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-        "include/detray/test/common/*.hpp"
-        "include/detray/test/common/detail/*.hpp"
-    )
-
-    add_library(detray_test_common INTERFACE "${_detray_test_headers}")
-    add_library(detray::test_common ALIAS detray_test_common)
-
-    target_include_directories(
-        detray_test_common
-        INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    )
-
-    target_link_libraries(
-        detray_test_common
-        INTERFACE GTest::gtest vecmem::core detray::core detray::test_utils
-    )
-
-    unset(_detray_test_headers)
-endif()
-
 # Include all of the code-holding sub-directories.
 
 # Build the benchmarks

tests/CMakeLists.txt

@@ -28,7 +28,7 @@ target_include_directories(
 
 target_link_libraries(
     detray_benchmarks
-    INTERFACE benchmark::benchmark vecmem::core detray::core detray::test_utils
+    INTERFACE benchmark::benchmark vecmem::core detray::core detray::test_common
 )
 
 unset(_detray_benchmarks_headers)

tests/benchmarks/CMakeLists.txt

@@ -24,7 +24,7 @@ macro(detray_add_cpu_benchmark algebra)
        "intersect_surfaces.cpp"
        "masks.cpp"
        LINK_LIBRARIES benchmark::benchmark benchmark::benchmark_main vecmem::core detray::benchmarks
-                      detray::core_${algebra} detray::test_utils
+                      detray::core_${algebra} detray::test_common
     )
 
     target_compile_options(
@@ -51,7 +51,7 @@ macro(detray_add_cpu_benchmark algebra)
     detray_add_executable( benchmark_cpu_propagation_${algebra}
        "propagation.cpp"
        LINK_LIBRARIES detray::benchmark_cpu benchmark::benchmark_main
-                     vecmem::core detray::core_${algebra} detray::test_utils
+                     vecmem::core detray::core_${algebra} detray::test_common
     )
 
     target_compile_options(
@@ -91,7 +91,7 @@ if(DETRAY_VC_SOA_PLUGIN)
         detray_add_executable(benchmark_cpu_vc_soa_vs_${algebra}
          "intersectors.cpp"
            LINK_LIBRARIES benchmark::benchmark benchmark::benchmark_main vecmem::core detray::core_vc_soa detray::core_vc_aos detray::core_${algebra}
-           detray::test_utils
+           detray::test_common
         )
 
         target_compile_options(

tests/benchmarks/cpu/CMakeLists.txt

@@ -5,9 +5,11 @@
  * Mozilla Public License Version 2.0
  */
 
-// Detray test include(s).
-#include "detray/test/utils/detectors/build_toy_detector.hpp"
-#include "detray/test/utils/types.hpp"
+// Detray benchmark include(s)
+#include "detray/benchmarks/types.hpp"
+
+// Detray test include(s)
+#include "detray/test/common/build_toy_detector.hpp"
 
 // VecMem include(s).
 #include <vecmem/memory/host_memory_resource.hpp>
@@ -21,8 +23,8 @@
 // Use the detray:: namespace implicitly.
 using namespace detray;
 
-using test_algebra = test::algebra;
-using scalar = test::scalar;
+using bench_algebra = benchmarks::algebra;
+using scalar = benchmarks::scalar;
 
 // Benchmarks the cost of searching a volume by position
 void BM_FIND_VOLUMES(benchmark::State &state) {
@@ -35,7 +37,7 @@ void BM_FIND_VOLUMES(benchmark::State &state) {
     vecmem::host_memory_resource host_mr;
     toy_det_config<scalar> toy_cfg{};
     toy_cfg.n_edc_layers(7u);
-    auto [d, names] = build_toy_detector<test_algebra>(host_mr, toy_cfg);
+    auto [d, names] = build_toy_detector<bench_algebra>(host_mr, toy_cfg);
 
     static const unsigned int itest = 10000u;
 
@@ -57,8 +59,8 @@ void BM_FIND_VOLUMES(benchmark::State &state) {
     for (auto _ : state) {
         for (unsigned int i1 = 0u; i1 < itest; ++i1) {
             for (unsigned int i0 = 0u; i0 < itest; ++i0) {
-                test::vector3 rz{static_cast<scalar>(i0) * step0, 0.f,
-                                 static_cast<scalar>(i1) * step1};
+                benchmarks::vector3 rz{static_cast<scalar>(i0) * step0, 0.f,
+                                       static_cast<scalar>(i1) * step1};
                 const auto &v = d.volume(rz);
 
                 benchmark::DoNotOptimize(successful);