Made sure that all CUDA and SYCL tests would have descriptive names.

I.e. that they would include "CUDA" and "SYCL" in their test names respectively. To make it easier to filter them out using CTest.
acts-project · Jun 19, 2024 · beec48e · beec48e
1 parent 41f1654
commit beec48e
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 89 deletions.
diff --git a/tests/cuda/test_cca.cpp b/tests/cuda/test_cca.cpp
@@ -62,7 +62,7 @@ TEST_P(ConnectedComponentAnalysisTests, Run) {
 }
 
 INSTANTIATE_TEST_SUITE_P(
-    FastSvAlgorithm, ConnectedComponentAnalysisTests,
+    CUDAFastSvAlgorithm, ConnectedComponentAnalysisTests,
     ::testing::Combine(
         ::testing::Values(f),
         ::testing::ValuesIn(ConnectedComponentAnalysisTests::get_test_files())),

diff --git a/tests/cuda/test_ckf_combinatorics_telescope.cpp b/tests/cuda/test_ckf_combinatorics_telescope.cpp
@@ -243,20 +243,18 @@ TEST_P(CudaCkfCombinatoricsTelescopeTests, Run) {
 
 // Testing two identical tracks
 INSTANTIATE_TEST_SUITE_P(
-    CudaCkfCombinatoricsTelescopeValidation0,
-    CudaCkfCombinatoricsTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "telescope_combinatorics_twin", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
-        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 2, 1)));
-
-// Testing three identical tracks
-INSTANTIATE_TEST_SUITE_P(
-    CudaCkfCombinatoricsTelescopeValidation1,
-    CudaCkfCombinatoricsTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "telescope_combinatorics_trio", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
-        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 3, 1)));
+    CUDACkfCombinatoricsTelescopeValidation, CudaCkfCombinatoricsTelescopeTests,
+    ::testing::Values(std::make_tuple("telescope_combinatorics_twin",
+                                      std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                                      std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                                      std::array<scalar, 2u>{100.f, 100.f},
+                                      std::array<scalar, 2u>{0.f, 0.f},
+                                      std::array<scalar, 2u>{0.f, 0.f}, -1.f, 2,
+                                      1),
+                      std::make_tuple("telescope_combinatorics_trio",
+                                      std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                                      std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                                      std::array<scalar, 2u>{100.f, 100.f},
+                                      std::array<scalar, 2u>{0.f, 0.f},
+                                      std::array<scalar, 2u>{0.f, 0.f}, -1.f, 3,
+                                      1)));
diff --git a/tests/cuda/test_ckf_toy_detector.cpp b/tests/cuda/test_ckf_toy_detector.cpp
@@ -238,21 +238,21 @@ TEST_P(CkfToyDetectorTests, Run) {
 }
 
 INSTANTIATE_TEST_SUITE_P(
-    CkfToyDetectorValidation0, CkfToyDetectorTests,
-    ::testing::Values(std::make_tuple(
-        "toy_n_particles_1", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{1.f, 100.f}, std::array<scalar, 2u>{-4.f, 4.f},
-        std::array<scalar, 2u>{-detray::constant<scalar>::pi,
-                               detray::constant<scalar>::pi},
-        -1.f, 1, 1)));
-
-INSTANTIATE_TEST_SUITE_P(
-    CkfToyDetectorValidation1, CkfToyDetectorTests,
-    ::testing::Values(std::make_tuple(
-        "toy_n_particles_10000", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{1.f, 100.f}, std::array<scalar, 2u>{-4.f, 4.f},
-        std::array<scalar, 2u>{-detray::constant<scalar>::pi,
-                               detray::constant<scalar>::pi},
-        -1.f, 10000, 1)));
+    CUDACkfToyDetectorValidation, CkfToyDetectorTests,
+    ::testing::Values(
+        std::make_tuple("toy_n_particles_1",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{1.f, 100.f},
+                        std::array<scalar, 2u>{-4.f, 4.f},
+                        std::array<scalar, 2u>{-detray::constant<scalar>::pi,
+                                               detray::constant<scalar>::pi},
+                        -1.f, 1, 1),
+        std::make_tuple("toy_n_particles_10000",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{1.f, 100.f},
+                        std::array<scalar, 2u>{-4.f, 4.f},
+                        std::array<scalar, 2u>{-detray::constant<scalar>::pi,
+                                               detray::constant<scalar>::pi},
+                        -1.f, 10000, 1)));
diff --git a/tests/cuda/test_kalman_fitter_telescope.cpp b/tests/cuda/test_kalman_fitter_telescope.cpp
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2022-2023 CERN for the benefit of the ACTS project
+ * (c) 2022-2024 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -217,25 +217,23 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
 }
 
 INSTANTIATE_TEST_SUITE_P(
-    KalmanFitTelescopeValidation0, KalmanFittingTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "cuda_telescope_1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f}, std::array<scalar, 2u>{1.f, 1.f},
-        std::array<scalar, 2u>{0.f, 0.f}, std::array<scalar, 2u>{0.f, 0.f},
-        -1.f, 100, 100)));
-
-INSTANTIATE_TEST_SUITE_P(
-    KalmanFitTelescopeValidation1, KalmanFittingTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "cuda_telescope_10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{0.f, 0.f},
-        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100)));
-
-INSTANTIATE_TEST_SUITE_P(
-    KalmanFitTelescopeValidation2, KalmanFittingTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "cuda_telescope_100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
-        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100)));
+    CUDAKalmanFitTelescopeValidation, KalmanFittingTelescopeTests,
+    ::testing::Values(
+        std::make_tuple("cuda_telescope_1_GeV_0_phi",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{1.f, 1.f},
+                        std::array<scalar, 2u>{0.f, 0.f},
+                        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100),
+        std::make_tuple("cuda_telescope_10_GeV_0_phi",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{10.f, 10.f},
+                        std::array<scalar, 2u>{0.f, 0.f},
+                        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100),
+        std::make_tuple("cuda_telescope_100_GeV_0_phi",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{100.f, 100.f},
+                        std::array<scalar, 2u>{0.f, 0.f},
+                        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100)));
diff --git a/tests/cuda/test_spacepoint_formation.cpp b/tests/cuda/test_spacepoint_formation.cpp
@@ -25,7 +25,7 @@
 
 using namespace traccc;
 
-TEST(spacepoint_formation, cuda) {
+TEST(CUDASpacepointFormation, cuda) {
 
     // Memory resource used by the EDM.
     vecmem::cuda::managed_memory_resource mng_mr;

diff --git a/tests/cuda/test_thrust.cu b/tests/cuda/test_thrust.cu
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2023 CERN for the benefit of the ACTS project
+ * (c) 2023-2024 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -32,7 +32,7 @@ vecmem::cuda::device_memory_resource device_resource;
 
 }  // namespace
 
-TEST(thrust, sort) {
+TEST(CUDAThrust, sort) {
 
     vecmem::vector<unsigned int> host_vector{{3, 2, 1, 8, 4}, &host_resource};
 
@@ -53,7 +53,7 @@ TEST(thrust, sort) {
     ASSERT_EQ(host_vector[4], 8);
 }
 
-TEST(thrust, scan) {
+TEST(CUDAThrust, scan) {
 
     vecmem::vector<unsigned int> host_vector{{3, 2, 1, 8, 4}, &host_resource};
 
@@ -75,7 +75,7 @@ TEST(thrust, scan) {
     ASSERT_EQ(host_vector[4], 18);
 }
 
-TEST(thrust, fill) {
+TEST(CUDAThrust, fill) {
 
     vecmem::vector<unsigned int> host_vector{{1, 1, 1, 1, 1, 1, 1},
                                              &host_resource};
@@ -98,4 +98,4 @@ TEST(thrust, fill) {
     ASSERT_EQ(host_vector[4], 112);
     ASSERT_EQ(host_vector[5], 112);
     ASSERT_EQ(host_vector[6], 112);
-}
+}
diff --git a/tests/sycl/test_kalman_fitter_telescope.sycl b/tests/sycl/test_kalman_fitter_telescope.sycl
@@ -1,6 +1,6 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2022-2023 CERN for the benefit of the ACTS project
+ * (c) 2022-2024 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -224,25 +224,23 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
 }
 
 INSTANTIATE_TEST_SUITE_P(
-    KalmanFitTelescopeValidation0, KalmanFittingTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "sycl_telescope_1_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f}, std::array<scalar, 2u>{1.f, 1.f},
-        std::array<scalar, 2u>{0.f, 0.f}, std::array<scalar, 2u>{0.f, 0.f},
-        -1.f, 100, 100)));
-
-INSTANTIATE_TEST_SUITE_P(
-    KalmanFitTelescopeValidation1, KalmanFittingTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "sycl_telescope_10_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{0.f, 0.f},
-        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100)));
-
-INSTANTIATE_TEST_SUITE_P(
-    KalmanFitTelescopeValidation2, KalmanFittingTelescopeTests,
-    ::testing::Values(std::make_tuple(
-        "sycl_telescope_100_GeV_0_phi", std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 3u>{0.f, 0.f, 0.f},
-        std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{0.f, 0.f},
-        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100)));
+    SYCLKalmanFitTelescopeValidation, KalmanFittingTelescopeTests,
+    ::testing::Values(
+        std::make_tuple("sycl_telescope_1_GeV_0_phi",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{1.f, 1.f},
+                        std::array<scalar, 2u>{0.f, 0.f},
+                        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100),
+        std::make_tuple("sycl_telescope_10_GeV_0_phi",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{10.f, 10.f},
+                        std::array<scalar, 2u>{0.f, 0.f},
+                        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100),
+        std::make_tuple("sycl_telescope_100_GeV_0_phi",
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 3u>{0.f, 0.f, 0.f},
+                        std::array<scalar, 2u>{100.f, 100.f},
+                        std::array<scalar, 2u>{0.f, 0.f},
+                        std::array<scalar, 2u>{0.f, 0.f}, -1.f, 100, 100)));
diff --git a/tests/sycl/test_spacepoint_formation.sycl b/tests/sycl/test_spacepoint_formation.sycl
@@ -38,7 +38,7 @@ auto handle_async_error = [](::sycl::exception_list elist) {
     }
 };
 
-TEST(spacepoint_formation, sycl) {
+TEST(SYCLSpacepointFormation, sycl) {
 
     // Memory resource used by the EDM.
     vecmem::sycl::shared_memory_resource shared_mr;