Removed const_device_array and const_device_vector from the tests.

acts-project · Nov 8, 2024 · 5cc6062 · 5cc6062
1 parent 9acccd8
commit 5cc6062
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 27 deletions.
diff --git a/tests/core/test_core_containers.cpp b/tests/core/test_core_containers.cpp
@@ -1,14 +1,12 @@
 /* VecMem project, part of the ACTS project (R&D line)
  *
- * (c) 2021-2023 CERN for the benefit of the ACTS project
+ * (c) 2021-2024 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
 
 // Local include(s).
 #include "vecmem/containers/array.hpp"
-#include "vecmem/containers/const_device_array.hpp"
-#include "vecmem/containers/const_device_vector.hpp"
 #include "vecmem/containers/device_array.hpp"
 #include "vecmem/containers/device_vector.hpp"
 #include "vecmem/containers/static_array.hpp"
@@ -38,7 +36,7 @@ class core_container_test : public testing::Test {
 /// Test(s) for @c vecmem::const_device_vector
 TEST_F(core_container_test, const_device_vector) {
 
-    const vecmem::const_device_vector<int> test_vector(
+    const vecmem::device_vector<const int> test_vector(
         vecmem::get_data(m_reference_vector));
     EXPECT_EQ(test_vector.size(), m_reference_vector.size());
     EXPECT_EQ(test_vector.empty(), m_reference_vector.empty());
@@ -47,8 +45,8 @@ TEST_F(core_container_test, const_device_vector) {
     EXPECT_EQ(std::accumulate(test_vector.begin(), test_vector.end(), 0),
               std::accumulate(test_vector.rbegin(), test_vector.rend(), 0));
     for (std::size_t i = 0; i < m_reference_vector.size(); ++i) {
-        const vecmem::const_device_vector<int>::size_type ii =
-            static_cast<vecmem::const_device_vector<int>::size_type>(i);
+        const vecmem::device_vector<const int>::size_type ii =
+            static_cast<vecmem::device_vector<const int>::size_type>(i);
         EXPECT_EQ(test_vector.at(ii), m_reference_vector.at(i));
         EXPECT_EQ(test_vector[ii], m_reference_vector[i]);
     }
@@ -66,8 +64,8 @@ TEST_F(core_container_test, device_vector) {
     EXPECT_EQ(std::accumulate(test_vector.begin(), test_vector.end(), 0),
               std::accumulate(test_vector.rbegin(), test_vector.rend(), 0));
     for (std::size_t i = 0; i < m_reference_vector.size(); ++i) {
-        const vecmem::const_device_vector<int>::size_type ii =
-            static_cast<vecmem::const_device_vector<int>::size_type>(i);
+        const vecmem::device_vector<int>::size_type ii =
+            static_cast<vecmem::device_vector<int>::size_type>(i);
         EXPECT_EQ(test_vector.at(ii), m_reference_vector.at(i));
         EXPECT_EQ(test_vector[ii], m_reference_vector[i]);
     }
@@ -97,7 +95,7 @@ TEST_F(core_container_test, array) {
 /// Test(s) for @c vecmem::const_device_array
 TEST_F(core_container_test, const_device_array) {
 
-    const vecmem::const_device_array<int, 9> test_array(
+    const vecmem::device_array<const int, 9> test_array(
         vecmem::get_data(m_reference_vector));
     EXPECT_EQ(test_array.size(), m_reference_vector.size());
     EXPECT_EQ(test_array.empty(), m_reference_vector.empty());

diff --git a/tests/cuda/test_cuda_containers_kernels.cu b/tests/cuda/test_cuda_containers_kernels.cu
@@ -1,6 +1,6 @@
 /* VecMem project, part of the ACTS project (R&D line)
  *
- * (c) 2021-2023 CERN for the benefit of the ACTS project
+ * (c) 2021-2024 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
@@ -9,8 +9,7 @@
 #include "../../cuda/src/utils/cuda_error_handling.hpp"
 #include "../../cuda/src/utils/cuda_wrappers.hpp"
 #include "test_cuda_containers_kernels.cuh"
-#include "vecmem/containers/const_device_array.hpp"
-#include "vecmem/containers/const_device_vector.hpp"
+#include "vecmem/containers/device_array.hpp"
 #include "vecmem/containers/device_vector.hpp"
 #include "vecmem/containers/jagged_device_vector.hpp"
 #include "vecmem/containers/static_array.hpp"
@@ -34,12 +33,12 @@ __global__ void linearTransformKernel(
     }
 
     // Create the helper containers.
-    const vecmem::const_device_array<int, 2> constantarray1(constants);
+    const vecmem::device_array<const int, 2> constantarray1(constants);
     const vecmem::static_array<int, 2> constantarray2 = {constantarray1[0],
                                                          constantarray1[1]};
     auto tuple1 = vecmem::make_tuple(constantarray1[0], constantarray1[1]);
     auto tuple2 = vecmem::tie(constantarray1, constantarray2);
-    const vecmem::const_device_vector<int> inputvec(input);
+    const vecmem::device_vector<const int> inputvec(input);
     vecmem::device_vector<int> outputvec(output);
 
     // Perform the linear transformation.
@@ -166,7 +165,7 @@ __global__ void filterTransformKernel(
     }
 
     // Set up the vector objects.
-    const vecmem::const_device_vector<int> inputvec(input);
+    const vecmem::device_vector<const int> inputvec(input);
     vecmem::device_vector<int> outputvec(output);
 
     // Add this thread's element, if it passes the selection.

diff --git a/tests/hip/test_hip_containers_kernels.hip b/tests/hip/test_hip_containers_kernels.hip
@@ -8,8 +8,7 @@
 // Local include(s).
 #include "../../hip/src/utils/hip_error_handling.hpp"
 #include "test_hip_containers_kernels.hpp"
-#include "vecmem/containers/const_device_array.hpp"
-#include "vecmem/containers/const_device_vector.hpp"
+#include "vecmem/containers/device_array.hpp"
 #include "vecmem/containers/device_vector.hpp"
 #include "vecmem/containers/jagged_device_vector.hpp"
 #include "vecmem/containers/static_array.hpp"
@@ -33,12 +32,12 @@ __global__ void linearTransformKernel(
     }
 
     // Create the helper containers.
-    const vecmem::const_device_array<int, 2> constantarray1(constants);
+    const vecmem::device_array<const int, 2> constantarray1(constants);
     const vecmem::static_array<int, 2> constantarray2 = {constantarray1[0],
                                                          constantarray1[1]};
     auto tuple1 = vecmem::make_tuple(constantarray1[0], constantarray1[1]);
     auto tuple2 = vecmem::tie(constantarray1, constantarray2);
-    const vecmem::const_device_vector<int> inputvec(input);
+    const vecmem::device_vector<const int> inputvec(input);
     vecmem::device_vector<int> outputvec(output);
 
     // Perform the linear transformation.
@@ -211,7 +210,7 @@ __global__ void filterTransformKernel(
     }
 
     // Set up the vector objects.
-    const vecmem::const_device_vector<int> inputvec(input);
+    const vecmem::device_vector<const int> inputvec(input);
     vecmem::device_vector<int> outputvec(output);
 
     // Add this thread's element, if it passes the selection.

diff --git a/tests/sycl/test_sycl_containers.sycl b/tests/sycl/test_sycl_containers.sycl
@@ -10,9 +10,8 @@
 
 // Local include(s).
 #include "vecmem/containers/array.hpp"
-#include "vecmem/containers/const_device_array.hpp"
-#include "vecmem/containers/const_device_vector.hpp"
 #include "vecmem/containers/data/jagged_vector_buffer.hpp"
+#include "vecmem/containers/device_array.hpp"
 #include "vecmem/containers/device_vector.hpp"
 #include "vecmem/containers/jagged_device_vector.hpp"
 #include "vecmem/containers/static_array.hpp"
@@ -70,14 +69,14 @@ TEST_F(sycl_containers_test, shared_memory) {
                     }
 
                     // Create the helper containers.
-                    const vecmem::const_device_array<int, 2> constantarray1(
+                    const vecmem::device_array<const int, 2> constantarray1(
                         constants);
                     const vecmem::static_array<int, 2> constantarray2 = {
                         constantarray1[0], constantarray1[1]};
                     auto tuple1 = vecmem::make_tuple(constantarray1[0],
                                                      constantarray1[1]);
                     auto tuple2 = vecmem::tie(constantarray1, constantarray2);
-                    const vecmem::const_device_vector<int> inputvec(input);
+                    const vecmem::device_vector<const int> inputvec(input);
                     vecmem::device_vector<int> outputvec(output);
 
                     // Perform the linear transformation.
@@ -155,9 +154,9 @@ TEST_F(sycl_containers_test, device_memory) {
                     }
 
                     // Create the helper containers.
-                    const vecmem::const_device_array<int, 2> constantarray(
+                    const vecmem::device_array<const int, 2> constantarray(
                         constants);
-                    const vecmem::const_device_vector<int> inputvec(input);
+                    const vecmem::device_vector<const int> inputvec(input);
                     vecmem::device_vector<int> outputvec(output);
 
                     // Perform the linear transformation.
@@ -423,7 +422,7 @@ TEST_F(sycl_containers_test, extendable_memory) {
                     }
 
                     // Set up the vector objects.
-                    const vecmem::const_device_vector<int> inputvec(input);
+                    const vecmem::device_vector<const int> inputvec(input);
                     vecmem::device_vector<int> outputvec(output);
 
                     // Add this thread's element, if it passes the selection.