Skip to content

Commit 1b04e6f

Browse files
jimmytweijimmytwei
authored
Fixes for ONSAM-1675 (#1986)
1 parent ed01dd5 commit 1b04e6f

7 files changed

Lines changed: 31 additions & 26 deletions

File tree

‎Libraries/oneCCL/oneCCL_Getting_Started/CMakeLists.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ cmake_minimum_required(VERSION 3.4)
22
if("${CMAKE_CXX_COMPILER}" STREQUAL "")
33
set(CMAKE_C_COMPILER "icx")
44
set(CMAKE_CXX_COMPILER "icpx")
5-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
5+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl")
66
endif()
77
project (oneCCL_Getting_Started)
88
if("$ENV{EXAMPLE_ROOT}" STREQUAL "")
9-
message(" - use default examples")
10-
if($ENV{CCL_CONFIGURATION} MATCHES "cpu_gpu_dpcpp")
11-
file(COPY $ENV{CCL_ROOT}/examples/sycl DESTINATION src)
12-
endif()
13-
file(COPY $ENV{CCL_ROOT}/examples/cpu DESTINATION src)
14-
file(COPY $ENV{CCL_ROOT}/examples/common DESTINATION src)
15-
file(COPY $ENV{CCL_ROOT}/examples/benchmark DESTINATION src)
16-
file(COPY $ENV{CCL_ROOT}/examples/external_launcher DESTINATION src)
17-
file(COPY $ENV{CCL_ROOT}/examples/include DESTINATION src)
18-
file(COPY $ENV{CCL_ROOT}/examples/CMakeLists.txt DESTINATION src)
19-
add_subdirectory (${PROJECT_BINARY_DIR}/src out)
9+
message(" - use default examples")
10+
if($ENV{CCL_CONFIGURATION} MATCHES "cpu_gpu_dpcpp")
11+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/sycl DESTINATION src)
12+
endif()
13+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/cpu DESTINATION src)
14+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/common DESTINATION src)
15+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/benchmark DESTINATION src)
16+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/external_launcher DESTINATION src)
17+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/include DESTINATION src)
18+
file(COPY $ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples/CMakeLists.txt DESTINATION src)
19+
add_subdirectory (${PROJECT_BINARY_DIR}/src out)
2020
else()
21-
add_subdirectory ($ENV{EXAMPLE_ROOT} out)
21+
add_subdirectory ($ENV{EXAMPLE_ROOT} out)
2222
endif()

‎Libraries/oneCCL/tutorials/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ if("${CMAKE_CXX_COMPILER}" STREQUAL "")
55
endif()
66
project (oneDNN)
77
if("$ENV{EXAMPLE_ROOT}" STREQUAL "")
8-
message(" - use default examples")
9-
add_subdirectory ($ENV{CCL_ROOT}/examples out)
8+
message(" - use default examples")
9+
add_subdirectory ($ENV{CCL_ROOT}/../ccl/latest/share/doc/ccl/examples out)
1010
else()
11-
add_subdirectory ($ENV{EXAMPLE_ROOT} out)
11+
add_subdirectory ($ENV{EXAMPLE_ROOT} out)
1212
endif()

‎Libraries/oneCCL/tutorials/requirements.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ipykernel
2+
nbformat
3+
nbconvert

‎Libraries/oneCCL/tutorials/sample.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"targetDevice": ["CPU", "GPU"],
1212
"ciTests": {
1313
"linux": [{
14-
"env": ["source /opt/intel/oneapi/setvars.sh --ccl-configuration=cpu_gpu_dpcpp --force" ],
1514
"id": "ccl gsg",
1615
"steps": [
17-
"/opt/intel/oneapi/intelpython/latest/bin/python -m ipykernel install --user --name=base",
18-
"python scripts/ci_test.py"
16+
"pip install -r requirements.txt",
17+
"python -m ipykernel install --user --name=base",
18+
"python scripts/ci_test.py"
1919
]
2020
}]
21-
}
21+
}
2222
}

‎Libraries/oneDNN/getting_started/CMakeLists.txt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ if("${CMAKE_CXX_COMPILER}" STREQUAL "")
44
set(CMAKE_CXX_COMPILER "icx")
55
endif()
66
project (getting_started)
7-
file(COPY $ENV{DNNLROOT}/examples/ DESTINATION src FILES_MATCHING PATTERN "*.cpp")
8-
file(COPY $ENV{DNNLROOT}/examples/CMakeLists.txt DESTINATION src)
7+
file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.cpp")
8+
file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.h")
9+
file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/ DESTINATION src FILES_MATCHING PATTERN "*.hpp")
10+
11+
file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/CMakeLists.txt DESTINATION src)
912
if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
10-
file(COPY $ENV{DNNLROOT}/examples/template.vcxproj.user DESTINATION src)
13+
file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/template.vcxproj.user DESTINATION src)
1114
else()
12-
file(COPY $ENV{DNNLROOT}/examples/dpcpp_driver_check.cmake DESTINATION src)
15+
file(COPY $ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples/dpcpp_driver_check.cmake DESTINATION src)
1316
endif()
1417
add_subdirectory (${PROJECT_BINARY_DIR}/src bin)

‎Libraries/oneDNN/getting_started/sample.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"targetDevice": ["CPU", "GPU"],
1212
"ciTests": {
1313
"linux": [{
14-
"env": ["source /opt/intel/oneapi/setvars.sh --dnnl-configuration=cpu_dpcpp_gpu_dpcpp --force" ],
1514
"id": "gsg",
1615
"steps": [
1716
"mkdir build",

‎Libraries/oneDNN/tutorials/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ endif()
66
project (oneDNN)
77
if("$ENV{EXAMPLE_ROOT}" STREQUAL "")
88
message(" - use default examples")
9-
add_subdirectory ($ENV{DNNLROOT}/examples out)
9+
add_subdirectory ($ENV{ONEAPI_ROOT}/../dnnl/latest/share/doc/dnnl/examples out)
1010
else()
1111
add_subdirectory ($ENV{EXAMPLE_ROOT} out)
1212
endif()

0 commit comments

Comments
 (0)