add cudnn include path to compiler.cpp (#902)

* add cudnn include path to compiler.cpp

* seperate two path

* Skipping one_hot tests for CPU as
CI is failing. JIRA bug report: https://jira01.devtools.intel.com/browse/NGRAPH-1682.

src/ngraph/CMakeLists.txt

@@ -287,6 +287,8 @@ endif()
             )
         set_property(SOURCE codegen/compiler.cpp APPEND_STRING PROPERTY COMPILE_DEFINITIONS
         "CUDA_HEADER_PATHS=\"${CUDA_INCLUDE_DIRS}\";")
+        set_property(SOURCE codegen/compiler.cpp APPEND_STRING PROPERTY COMPILE_DEFINITIONS
+        "CUDNN_HEADER_PATHS=\"${CUDNN_INCLUDE_DIRS}\";")
     endif()
 
 endif()

src/ngraph/codegen/compiler.cpp

@@ -419,6 +419,11 @@ void codegen::StaticCompiler::configure_search_path()
     add_header_search_path(CUDA_HEADER_PATHS);
 #endif
 
+#ifdef CUDNN_HEADER_PATHS
+    // Only needed for GPU backend
+    add_header_search_path(CUDNN_HEADER_PATHS);
+#endif
+
 #ifdef NGRAPH_DISTRIBUTED
     add_header_search_path(MPI_HEADER_PATH);
 #endif

test/backend_test.in.cpp

@@ -3384,6 +3384,7 @@ TEST(${BACKEND_NAME}, replace_slice_vector)
 
 TEST(${BACKEND_NAME}, one_hot_scalar_2_in_3)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
     Shape shape_r{3};
@@ -3403,6 +3404,7 @@ TEST(${BACKEND_NAME}, one_hot_scalar_2_in_3)
 
 TEST(${BACKEND_NAME}, one_hot_scalar_1_in_3)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
     Shape shape_r{3};
@@ -3422,6 +3424,7 @@ TEST(${BACKEND_NAME}, one_hot_scalar_1_in_3)
 
 TEST(${BACKEND_NAME}, one_hot_scalar_0_in_3)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
     Shape shape_r{3};
@@ -3442,6 +3445,7 @@ TEST(${BACKEND_NAME}, one_hot_scalar_0_in_3)
 TEST(${BACKEND_NAME}, one_hot_scalar_fp_nonint_in_3)
 {
     SKIP_TEST_FOR("GPU", "${BACKEND_NAME}");
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{};
     auto A = make_shared<op::Parameter>(element::f32, shape_a);
     Shape shape_r{3};
@@ -3471,6 +3475,7 @@ TEST(${BACKEND_NAME}, one_hot_scalar_fp_nonint_in_3)
 
 TEST(${BACKEND_NAME}, one_hot_scalar_oob_in_3)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     SKIP_TEST_FOR("GPU", "${BACKEND_NAME}");
     SKIP_TEST_FOR("NNP_TESTER", "${BACKEND_NAME}");
 
@@ -3503,6 +3508,7 @@ TEST(${BACKEND_NAME}, one_hot_scalar_oob_in_3)
 
 TEST(${BACKEND_NAME}, one_hot_vector_0)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{8};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
     Shape shape_r{3, 8};
@@ -3524,6 +3530,7 @@ TEST(${BACKEND_NAME}, one_hot_vector_0)
 
 TEST(${BACKEND_NAME}, one_hot_vector_1)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{8};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
     Shape shape_r{8, 3};
@@ -3545,6 +3552,7 @@ TEST(${BACKEND_NAME}, one_hot_vector_1)
 
 TEST(${BACKEND_NAME}, one_hot_vector_1_barely_oob)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     SKIP_TEST_FOR("GPU", "${BACKEND_NAME}");
     Shape shape_a{8};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
@@ -3575,6 +3583,7 @@ TEST(${BACKEND_NAME}, one_hot_vector_1_barely_oob)
 
 TEST(${BACKEND_NAME}, one_hot_vector_1_far_oob)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     SKIP_TEST_FOR("GPU", "${BACKEND_NAME}");
     SKIP_TEST_FOR("NNP_TESTER", "${BACKEND_NAME}");
 
@@ -3607,6 +3616,7 @@ TEST(${BACKEND_NAME}, one_hot_vector_1_far_oob)
 
 TEST(${BACKEND_NAME}, one_hot_matrix_0)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{3, 3};
     auto A = make_shared<op::Parameter>(element::i32, shape_a);
     Shape shape_r{3, 3, 3};
@@ -3634,6 +3644,7 @@ TEST(${BACKEND_NAME}, one_hot_matrix_0)
 
 TEST(${BACKEND_NAME}, one_hot_vector_1_fp)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     Shape shape_a{8};
     auto A = make_shared<op::Parameter>(element::f32, shape_a);
     Shape shape_r{8, 3};
@@ -3655,6 +3666,7 @@ TEST(${BACKEND_NAME}, one_hot_vector_1_fp)
 
 TEST(${BACKEND_NAME}, one_hot_vector_1_fp_nonint)
 {
+    SKIP_TEST_FOR("CPU", "${BACKEND_NAME}");
     SKIP_TEST_FOR("GPU", "${BACKEND_NAME}");
     Shape shape_a{8};
     auto A = make_shared<op::Parameter>(element::f32, shape_a);