Merge pull request oneapi-src#811 from veselypeta/petr/fix-prefixes

[UR] Remove `cuda_`/`hip_` prefixes from tests files.
bratpiorka · Aug 21, 2023 · 12c0cdf · 12c0cdf
2 parents 318ef5a + fa89ec4
commit 12c0cdf
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 21 deletions.
diff --git a/test/conformance/adapters/cuda/CMakeLists.txt b/test/conformance/adapters/cuda/CMakeLists.txt
@@ -5,13 +5,13 @@
 
 set(USE_LOCAL_TEST_CONFIGURATION ON)
 add_conformance_test_with_devices_environment(adapter-cuda
- cuda_fixtures.h
+ fixtures.h
  context_tests.cpp
- cuda_urContextGetNativeHandle.cpp
- cuda_urDeviceGetNativeHandle.cpp
- cuda_urDeviceCreateWithNativeHandle.cpp
- cuda_urEventGetNativeHandle.cpp
- cuda_urEventCreateWithNativeHandle.cpp
+ urContextGetNativeHandle.cpp
+ urDeviceGetNativeHandle.cpp
+ urDeviceCreateWithNativeHandle.cpp
+ urEventGetNativeHandle.cpp
+ urEventCreateWithNativeHandle.cpp
  kernel_tests.cpp
  memory_tests.cpp
 )

diff --git a/test/conformance/adapters/cuda/context_tests.cpp b/test/conformance/adapters/cuda/context_tests.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include "context.hpp"
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 #include "queue.hpp"
 #include <thread>
 

diff --git a/...conformance/adapters/cuda/cuda_fixtures.h → test/conformance/adapters/cuda/fixtures.h b/...conformance/adapters/cuda/cuda_fixtures.h → test/conformance/adapters/cuda/fixtures.h
diff --git a/test/conformance/adapters/cuda/memory_tests.cpp b/test/conformance/adapters/cuda/memory_tests.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 
 using cudaMemoryTest = uur::urContextTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(cudaMemoryTest);

diff --git a/...rs/cuda/cuda_urContextGetNativeHandle.cpp → ...dapters/cuda/urContextGetNativeHandle.cpp b/...rs/cuda/cuda_urContextGetNativeHandle.cpp → ...dapters/cuda/urContextGetNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 
 using urCudaContextGetNativeHandle = uur::urContextTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaContextGetNativeHandle);

diff --git a/...a/cuda_urDeviceCreateWithNativeHandle.cpp → ...s/cuda/urDeviceCreateWithNativeHandle.cpp b/...a/cuda_urDeviceCreateWithNativeHandle.cpp → ...s/cuda/urDeviceCreateWithNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 
 using urCudaDeviceCreateWithNativeHandle = uur::urPlatformTest;
 

diff --git a/...ers/cuda/cuda_urDeviceGetNativeHandle.cpp → ...adapters/cuda/urDeviceGetNativeHandle.cpp b/...ers/cuda/cuda_urDeviceGetNativeHandle.cpp → ...adapters/cuda/urDeviceGetNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 
 using urCudaGetDeviceNativeHandle = uur::urDeviceTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaGetDeviceNativeHandle);

diff --git a/...da/cuda_urEventCreateWithNativeHandle.cpp → ...rs/cuda/urEventCreateWithNativeHandle.cpp b/...da/cuda_urEventCreateWithNativeHandle.cpp → ...rs/cuda/urEventCreateWithNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 
 using urCudaEventCreateWithNativeHandleTest = uur::urQueueTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaEventCreateWithNativeHandleTest);

diff --git a/...ters/cuda/cuda_urEventGetNativeHandle.cpp → .../adapters/cuda/urEventGetNativeHandle.cpp b/...ters/cuda/cuda_urEventGetNativeHandle.cpp → .../adapters/cuda/urEventGetNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "cuda_fixtures.h"
+#include "fixtures.h"
 
 using urCudaEventGetNativeHandleTest = uur::urQueueTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urCudaEventGetNativeHandleTest);

diff --git a/test/conformance/adapters/hip/CMakeLists.txt b/test/conformance/adapters/hip/CMakeLists.txt
@@ -5,10 +5,10 @@
 
 set(USE_LOCAL_TEST_CONFIGURATION ON)
 add_conformance_test_with_devices_environment(adapter-hip 
- hip_fixtures.h
- hip_urContextGetNativeHandle.cpp
- hip_urDeviceGetNativeHandle.cpp
- hip_urEventGetNativeHandle.cpp
+ fixtures.h
+ urContextGetNativeHandle.cpp
+ urDeviceGetNativeHandle.cpp
+ urEventGetNativeHandle.cpp
  test_context.cpp
 )
 target_link_libraries(test-adapter-hip PRIVATE rocmdrv)

diff --git a/test/conformance/adapters/hip/hip_fixtures.h → test/conformance/adapters/hip/fixtures.h b/test/conformance/adapters/hip/hip_fixtures.h → test/conformance/adapters/hip/fixtures.h
diff --git a/test/conformance/adapters/hip/test_context.cpp b/test/conformance/adapters/hip/test_context.cpp
@@ -6,7 +6,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include "context.hpp"
-#include "hip_fixtures.h"
+#include "fixtures.h"
 #include "queue.hpp"
 
 using urHipContextTest = uur::urDeviceTest;

diff --git a/...ters/hip/hip_urContextGetNativeHandle.cpp → ...adapters/hip/urContextGetNativeHandle.cpp b/...ters/hip/hip_urContextGetNativeHandle.cpp → ...adapters/hip/urContextGetNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "hip_fixtures.h"
+#include "fixtures.h"
 
 using urHipContextGetNativeHandleTest = uur::urContextTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipContextGetNativeHandleTest);

diff --git a/...pters/hip/hip_urDeviceGetNativeHandle.cpp → .../adapters/hip/urDeviceGetNativeHandle.cpp b/...pters/hip/hip_urDeviceGetNativeHandle.cpp → .../adapters/hip/urDeviceGetNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "hip_fixtures.h"
+#include "fixtures.h"
 
 using urHipGetDeviceNativeHandle = uur::urDeviceTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipGetDeviceNativeHandle);

diff --git a/...apters/hip/hip_urEventGetNativeHandle.cpp → ...e/adapters/hip/urEventGetNativeHandle.cpp b/...apters/hip/hip_urEventGetNativeHandle.cpp → ...e/adapters/hip/urEventGetNativeHandle.cpp
@@ -3,7 +3,7 @@
 // See LICENSE.TXT
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "hip_fixtures.h"
+#include "fixtures.h"
 
 using urHipEventGetNativeHandleTest = uur::urQueueTest;
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urHipEventGetNativeHandleTest);