Adjust tests to account for namespace of wrap/unwrap

oleksandr-pavlyk · oleksandr-pavlyk · commit 9c1db5f30489 · 2022-11-03T13:40:26.000-05:00
diff --git a/libsyclinterface/tests/test_sycl_context_interface.cpp b/libsyclinterface/tests/test_sycl_context_interface.cpp
@@ -103,9 +103,6 @@ TEST_P(TestDPCTLContextInterface, ChkCreateWithDevicesGetDevices)
     DPCTLDeviceVectorRef DVRef = nullptr;
     DPCTLDeviceVectorRef Res_DVRef = nullptr;
 
-    /* TODO: Once we have wrappers for sub-device creation let us use those
-     * functions.
-     */
     EXPECT_NO_FATAL_FAILURE(nCUs = DPCTLDevice_GetMaxComputeUnits(DRef));
     if (nCUs > 1) {
         EXPECT_NO_FATAL_FAILURE(
diff --git a/libsyclinterface/tests/test_sycl_device_aspects.cpp b/libsyclinterface/tests/test_sycl_device_aspects.cpp
@@ -134,6 +134,8 @@ auto build_params()
     return build_gtest_values(pairs);
 }
 
+using namespace dpctl::syclinterface;
+
 } // namespace
 
 struct TestDPCTLSyclDeviceInterfaceAspects
@@ -161,7 +163,7 @@ struct TestDPCTLSyclDeviceInterfaceAspects
         EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
         if (!DRef)
             GTEST_SKIP_("Device not found");
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         auto syclAspect = GetParam().second.second;
         try {
             hasAspect = D->has(syclAspect);
diff --git a/libsyclinterface/tests/test_sycl_device_subdevices.cpp b/libsyclinterface/tests/test_sycl_device_subdevices.cpp
@@ -36,6 +36,7 @@
 #include <gtest/gtest.h>
 
 using namespace sycl;
+using namespace dpctl::syclinterface;
 
 const DPCTLPartitionAffinityDomainType a_dpctl_domain =
     DPCTLPartitionAffinityDomainType::not_applicable;
@@ -137,7 +138,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityNotApplicable)
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         try {
             auto subDevices = D->create_sub_devices<
                 info::partition_property::partition_by_affinity_domain>(domain);
@@ -166,7 +167,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityNuma)
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         size_t expected_size = 0;
         try {
             auto subDevices = D->create_sub_devices<
@@ -197,7 +198,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityL4Cache)
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         size_t expected_size = 0;
         try {
             auto subDevices = D->create_sub_devices<
@@ -228,7 +229,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityL3Cache)
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         size_t expected_size = 0;
         try {
             auto subDevices = D->create_sub_devices<
@@ -259,7 +260,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityL2Cache)
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         size_t expected_size = 0;
         try {
             auto subDevices = D->create_sub_devices<
@@ -290,7 +291,7 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCreateSubDevicesByAffinityL1Cache)
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         size_t expected_size = 0;
         try {
             auto subDevices = D->create_sub_devices<
@@ -322,7 +323,7 @@ TEST_P(TestDPCTLSyclDeviceInterface,
         EXPECT_NO_FATAL_FAILURE(
             DVRef = DPCTLDevice_CreateSubDevicesByAffinity(DRef, dpctl_domain));
 
-        auto D = unwrap(DRef);
+        auto D = unwrap<device>(DRef);
         size_t expected_size = 0;
         try {
             auto subDevices = D->create_sub_devices<
diff --git a/libsyclinterface/tests/test_sycl_queue_interface.cpp b/libsyclinterface/tests/test_sycl_queue_interface.cpp
@@ -37,6 +37,7 @@
 #include <gtest/gtest.h>
 
 using namespace sycl;
+using namespace dpctl::syclinterface;
 
 namespace
 {
@@ -347,7 +348,7 @@ TEST(TestDPCTLSyclQueueInterface, CheckMemOpsZeroQRef)
 
 TEST_P(TestDPCTLQueueMemberFunctions, CheckGetBackend)
 {
-    auto q = unwrap(QRef);
+    auto q = unwrap<queue>(QRef);
     auto Backend = q->get_device().get_platform().get_backend();
     auto Bty = DPCTLQueue_GetBackend(QRef);
     switch (Bty) {
diff --git a/libsyclinterface/tests/test_sycl_queue_submit.cpp b/libsyclinterface/tests/test_sycl_queue_submit.cpp
@@ -41,6 +41,9 @@ namespace
 {
 constexpr size_t SIZE = 1024;
 static_assert(SIZE % 8 == 0);
+
+using namespace dpctl::syclinterface;
+
 } /* end of anonymous namespace */
 
 struct TestQueueSubmit : public ::testing::Test
@@ -92,8 +95,8 @@ TEST_F(TestQueueSubmit, CheckSubmitRange_saxpy)
     auto c = DPCTLmalloc_shared(SIZE * sizeof(float), QRef);
     ASSERT_TRUE(c != nullptr);
 
-    auto a_ptr = reinterpret_cast<float *>(unwrap(a));
-    auto b_ptr = reinterpret_cast<float *>(unwrap(b));
+    auto a_ptr = reinterpret_cast<float *>(unwrap<void>(a));
+    auto b_ptr = reinterpret_cast<float *>(unwrap<void>(b));
     // Initialize a,b
     for (auto i = 0ul; i < SIZE; ++i) {
         a_ptr[i] = i + 1.0;
@@ -103,7 +106,8 @@ TEST_F(TestQueueSubmit, CheckSubmitRange_saxpy)
     // Create kernel args for axpy
     float d = 10.0;
     size_t Range[] = {SIZE};
-    void *args2[4] = {unwrap(a), unwrap(b), unwrap(c), (void *)&d};
+    void *args2[4] = {unwrap<void>(a), unwrap<void>(b), unwrap<void>(c),
+                      (void *)&d};
     DPCTLKernelArgType addKernelArgTypes[] = {DPCTL_VOID_PTR, DPCTL_VOID_PTR,
                                               DPCTL_VOID_PTR, DPCTL_FLOAT};
     auto ERef = DPCTLQueue_SubmitRange(
@@ -152,8 +156,8 @@ TEST_F(TestQueueSubmit, CheckSubmitNDRange_saxpy)
     auto c = DPCTLmalloc_shared(SIZE * sizeof(float), QRef);
     ASSERT_TRUE(c != nullptr);
 
-    auto a_ptr = reinterpret_cast<float *>(unwrap(a));
-    auto b_ptr = reinterpret_cast<float *>(unwrap(b));
+    auto a_ptr = reinterpret_cast<float *>(unwrap<void>(a));
+    auto b_ptr = reinterpret_cast<float *>(unwrap<void>(b));
     // Initialize a,b
     for (auto i = 0ul; i < SIZE; ++i) {
         a_ptr[i] = i + 1.0;
@@ -164,7 +168,8 @@ TEST_F(TestQueueSubmit, CheckSubmitNDRange_saxpy)
     float d = 10.0;
     size_t gRange[] = {1, 1, SIZE};
     size_t lRange[] = {1, 1, 8};
-    void *args2[4] = {unwrap(a), unwrap(b), unwrap(c), (void *)&d};
+    void *args2[4] = {unwrap<void>(a), unwrap<void>(b), unwrap<void>(c),
+                      (void *)&d};
     DPCTLKernelArgType addKernelArgTypes[] = {DPCTL_VOID_PTR, DPCTL_VOID_PTR,
                                               DPCTL_VOID_PTR, DPCTL_FLOAT};
     DPCTLSyclEventRef events[1];

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`#include <gtest/gtest.h>`
`38`	`38`
`39`	`39`	`using namespace sycl;`
	`40`	`+using namespace dpctl::syclinterface;`
`40`	`41`
`41`	`42`	`namespace`
`42`	`43`	`{`
`@@ -347,7 +348,7 @@ TEST(TestDPCTLSyclQueueInterface, CheckMemOpsZeroQRef)`
`347`	`348`
`348`	`349`	`TEST_P(TestDPCTLQueueMemberFunctions, CheckGetBackend)`
`349`	`350`	`{`
`350`		`- auto q = unwrap(QRef);`
	`351`	`+ auto q = unwrap<queue>(QRef);`
`351`	`352`	`auto Backend = q->get_device().get_platform().get_backend();`
`352`	`353`	`auto Bty = DPCTLQueue_GetBackend(QRef);`
`353`	`354`	`switch (Bty) {`