Fixes for oneCCL and oneDNN samples (#1988)

Author: jimmytwei

Libraries/oneCCL/oneCCL_Getting_Started/CMakeLists.txt

@@ -2,20 +2,20 @@ cmake_minimum_required(VERSION 3.4)
 if("${CMAKE_CXX_COMPILER}" STREQUAL "")
        set(CMAKE_C_COMPILER "icx")
        set(CMAKE_CXX_COMPILER "icpx")
-           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
 endif()
 project (oneCCL_Getting_Started)
 if("$ENV{EXAMPLE_ROOT}" STREQUAL "")
         message(" - use default examples")
         if($ENV{CCL_CONFIGURATION} MATCHES "cpu_gpu_dpcpp")
-                file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/sycl DESTINATION src)
+                file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/sycl DESTINATION src)
         endif()
-        file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/cpu DESTINATION src)
-        file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/common DESTINATION src)
-        file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/benchmark DESTINATION src)
-        file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/external_launcher DESTINATION src)
-        file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/include DESTINATION src)
-        file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/CMakeLists.txt DESTINATION src)
+        file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/cpu DESTINATION src)
+        file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/common DESTINATION src)
+        file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/benchmark DESTINATION src)
+        file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/external_launcher DESTINATION src)
+        file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/include DESTINATION src)
+        file(COPY $ENV{CCL_ROOT}/share/doc/ccl/examples/CMakeLists.txt DESTINATION src)
         add_subdirectory (${PROJECT_BINARY_DIR}/src out)
 else()
         add_subdirectory ($ENV{EXAMPLE_ROOT} out)

Libraries/oneCCL/tutorials/CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 project (oneDNN)
 if("$ENV{EXAMPLE_ROOT}" STREQUAL "")
         message(" - use default examples")
-        add_subdirectory ($ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples out)
+        add_subdirectory ($ENV{CCL_ROOT}/share/doc/ccl/examples out)
 else()
         add_subdirectory ($ENV{EXAMPLE_ROOT} out)
 endif()

Libraries/oneDNN/getting_started/CMakeLists.txt

@@ -4,14 +4,14 @@ if("${CMAKE_CXX_COMPILER}" STREQUAL "")
     set(CMAKE_CXX_COMPILER "icx")
 endif()
 project (getting_started)
-file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.cpp")
-file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.h")
-file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.hpp")
+file(COPY $ENV{DNNLROOT}/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.cpp")
+file(COPY $ENV{DNNLROOT}/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.h")
+file(COPY $ENV{DNNLROOT}/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.hpp")
 
-file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/CMakeLists.txt DESTINATION src)
+file(COPY $ENV{DNNLROOT}/share/doc/dnnl/examples/CMakeLists.txt DESTINATION src)
 if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
-    file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/template.vcxproj.user DESTINATION src)
+    file(COPY $ENV{DNNLROOT}/share/doc/dnnl/examples/template.vcxproj.user DESTINATION src)
 else()
-    file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/dpcpp_driver_check.cmake DESTINATION src)
+    file(COPY $ENV{DNNLROOT}/share/doc/dnnl/examples/dpcpp_driver_check.cmake DESTINATION src)
 endif()
 add_subdirectory (${PROJECT_BINARY_DIR}/src bin)

Libraries/oneDNN/tutorials/CMakeLists.txt

@@ -5,8 +5,8 @@ if("${CMAKE_CXX_COMPILER}" STREQUAL "")
 endif()
 project (oneDNN)
 if("$ENV{EXAMPLE_ROOT}" STREQUAL "")
-	message(" - use default examples")
-	add_subdirectory ($ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples out)
+        message(" - use default examples")
+        add_subdirectory ($ENV{DNNLROOT}/share/doc/dnnl/examples/ out)
 else()
-	add_subdirectory ($ENV{EXAMPLE_ROOT} out)
+        add_subdirectory ($ENV{EXAMPLE_ROOT} out)
 endif()