gpu: nvidia: skip unsupported gtests

sgeor255 · Nov 12, 2024 · 2861953 · 2861953
1 parent 8935834
commit 2861953
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -75,7 +75,10 @@ if(DNNL_SYCL_CUDA)
         ${CMAKE_CURRENT_SOURCE_DIR}/primitives/lstm.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/primitives/layer_normalization.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/primitives/reorder.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/primitives/shuffle.cpp)
+        ${CMAKE_CURRENT_SOURCE_DIR}/primitives/shuffle.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/primitives/group_normalization.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/primitives/vanilla_rnn.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/primitives/lbr_gru.cpp)
 endif()
 
 # Remove examples for Graph API if graph component is not enabled

diff --git a/tests/gtests/sycl/api/CMakeLists.txt b/tests/gtests/sycl/api/CMakeLists.txt
@@ -28,7 +28,7 @@ if(DNNL_WITH_SYCL)
     endif()
 
     # Enable linking SYCL kernels.
-    if(DNNL_SYCL_CUDA OR (DNNL_SYCL_GENERIC AND NVIDIA_TARGET_SUPPORTED))
+    if(DNNL_SYCL_GENERIC AND NVIDIA_TARGET_SUPPORTED)
         append(CMAKE_CXX_FLAGS "-fsycl-targets=nvptx64-nvidia-cuda")
         append(CMAKE_CXX_FLAGS "-Wno-linker-warnings")
     endif()

diff --git a/tests/gtests/test_deconvolution.cpp b/tests/gtests/test_deconvolution.cpp
@@ -312,10 +312,10 @@ class deconvolution_test_t
         auto aa = allows_attr_t {false};
 
 #ifndef DNNL_SYCL_GENERIC
-        aa.po_binary = !is_nvidia_gpu(eng) && !is_amd_gpu(eng);
-        aa.po_eltwise = !is_nvidia_gpu(eng) && !is_amd_gpu(eng);
-        aa.po_prelu = !is_nvidia_gpu(eng) && !is_amd_gpu(eng);
-        aa.po_sum = !is_nvidia_gpu(eng) && !is_amd_gpu(eng);
+        aa.po_binary = !is_amd_gpu(eng);
+        aa.po_eltwise = !is_amd_gpu(eng);
+        aa.po_prelu = !is_amd_gpu(eng);
+        aa.po_sum = !is_amd_gpu(eng);
 #else
         aa.po_eltwise = true;
         aa.po_sum = true;

diff --git a/tests/gtests/test_group_normalization.cpp b/tests/gtests/test_group_normalization.cpp
@@ -46,6 +46,8 @@ class group_normalization_test_t
 
 protected:
     void SetUp() override {
+        SKIP_IF_CUDA(
+                true, "Group Normalization operator is not supported in CUDA");
         SKIP_IF_HIP(
                 true, "Group Normalization operator is not supported in HIP");
         SKIP_IF_GENERIC(true,

diff --git a/tests/gtests/test_iface_attr_quantization.cpp b/tests/gtests/test_iface_attr_quantization.cpp
@@ -432,6 +432,9 @@ TEST_F(attr_quantization_test_t, TestLRN) {
 }
 
 TEST_F(attr_quantization_test_t, TestMatmul) {
+    // cuDNN doesn't support zero points
+    SKIP_IF_CUDA(true, "Test not supported on cuda");
+
     for (auto a_dt : {data_type::f32, data_type::u8}) {
         const data_type b_dt
                 = a_dt == data_type::f32 ? data_type::f32 : data_type::s8;

diff --git a/tests/gtests/test_matmul.cpp b/tests/gtests/test_matmul.cpp
@@ -260,9 +260,9 @@ class matmul_iface_test_t
         auto matmul_pd = pd_t(eng, src_md, weights_md, bia_md, dst_md, attr);
 
         auto aa = allows_attr_t {false};
-        aa.po_binary = !is_nvidia_gpu(eng) && !is_amd_gpu(eng);
+        aa.po_binary = !is_amd_gpu(eng);
         aa.po_eltwise = true;
-        aa.po_prelu = !is_nvidia_gpu(eng) && !is_amd_gpu(eng);
+        aa.po_prelu = !is_amd_gpu(eng);
         aa.po_sum = true;
         // scales are not supported by HIP
         aa.scales = !is_amd_gpu(eng);

diff --git a/tests/gtests/test_softmax.cpp b/tests/gtests/test_softmax.cpp
@@ -168,7 +168,7 @@ class softmax_test_t : public ::testing::TestWithParam<softmax_test_params_t> {
                                              : p.aprop_kind;
 
         allows_attr_t aa {false};
-        if (!(is_nvidia_gpu(eng) || is_amd_gpu(eng))) {
+        if (!is_amd_gpu(eng)) {
             aa.po_eltwise = true;
             aa.po_binary = true;
         }