Skip to content

Commit 7e963dd

Browse files
committed
Limit SYCL CI to SYCL-only build
1 parent fe22685 commit 7e963dd

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

.github/workflows/sycl-ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
"$llvmDir\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
229229
"$ninjaDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
230230
231-
- name: Configure, build and test
231+
- name: Configure and build
232232
if: runner.os != 'Windows'
233233
shell: bash
234234
run: |
@@ -255,11 +255,10 @@ jobs:
255255
cmake_args+=(-DOpenMP_ROOT=${ITLABAI_OPENMP_ROOT})
256256
fi
257257
cmake "${cmake_args[@]}"
258-
cmake --build "${build_dir}" --target SYCL_Example run_test --parallel
259-
ctest --test-dir "${build_dir}" --output-on-failure -R '^UnitTests$'
258+
cmake --build "${build_dir}" --target SYCL_Example --parallel
260259
done
261260
262-
- name: Configure, build and test
261+
- name: Configure and build
263262
if: runner.os == 'Windows'
264263
shell: pwsh
265264
run: |
@@ -285,8 +284,6 @@ jobs:
285284
}
286285
& cmake @cmakeArgs
287286
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
288-
& cmake --build $buildDir --target SYCL_Example run_test --parallel
289-
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
290-
& ctest --test-dir $buildDir --output-on-failure -R '^UnitTests$'
287+
& cmake --build $buildDir --target SYCL_Example --parallel
291288
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
292289
}

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
4343

4444
add_subdirectory(3rdparty)
4545

46-
include(cmake/opencv_config.cmake)
4746
include(cmake/kokkos_config.cmake)
4847

4948
include_directories("${KOKKOS_INSTALL_DIR}/include")
@@ -81,12 +80,13 @@ foreach(CONFIG "" _DEBUG _RELEASE)
8180
set("CMAKE_RUNTIME_OUTPUT_DIRECTORY${CONFIG}" "${CMAKE_BINARY_DIR}/bin")
8281
endforeach()
8382

84-
add_subdirectory(app)
8583
add_subdirectory(include)
8684
add_subdirectory(src)
8785

8886
if(ITLABAI_ENABLE_SYCL)
8987
add_subdirectory(app/SYCL)
88+
else()
89+
include(cmake/opencv_config.cmake)
90+
add_subdirectory(app)
91+
add_subdirectory(test)
9092
endif()
91-
92-
add_subdirectory(test)

0 commit comments

Comments
 (0)