Skip to content

Bump DPC++ and hipSYCL versions used for CI #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
psalz wants to merge 4 commits into from
Closed

Bump DPC++ and hipSYCL versions used for CI #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d557f6
Encode SYCL impl version in CI container image tag
psalz Dec 9, 2021
111cbaf
Bump DPC++ and hipSYCL CI container versions
psalz Dec 9, 2021
7f8cf7f
Update DPC++ CI filter for 6699a5d
psalz Dec 9, 2021
d752a19
Update FindDPCPP.cmake
bader Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build_ci_containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
# - sycl-impl: computecpp
# version: 2.6.0
- sycl-impl: dpcpp
version: f5c838cd
version: 6699a5d
- sycl-impl: hipsycl
version: 72a29fb9
version: b836149
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -61,8 +61,8 @@ jobs:
with:
context: docker/${{ matrix.sycl-impl }}
push: true
tags: khronosgroup/sycl-cts-ci:${{ matrix.sycl-impl }}
cache-from: type=registry,ref=khronosgroup/sycl-cts-ci:${{ matrix.sycl-impl }}
tags: khronosgroup/sycl-cts-ci:${{ matrix.sycl-impl }}-${{ matrix.version }}
cache-from: type=registry,ref=khronosgroup/sycl-cts-ci:${{ matrix.sycl-impl }}-${{ matrix.version }}
cache-to: type=inline
build-args: |
IMPL_VERSION=${{ matrix.version }}
12 changes: 9 additions & 3 deletions .github/workflows/cts_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ jobs:
strategy:
fail-fast: false
matrix:
sycl-impl: [computecpp, dpcpp, hipsycl]
include:
- sycl-impl: computecpp
version: 2.6.0
- sycl-impl: dpcpp
version: 6699a5d
- sycl-impl: hipsycl
version: b836149
env:
container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
parallel-build-jobs: 2
container:
# image: khronosgroup/sycl-cts-ci:${{ matrix.sycl-impl }}
# image: khronosgroup/sycl-cts-ci:${{ matrix.sycl-impl }}-${{ matrix.version }}
# ComputeCpp images are hosted by Codeplay
image: ${{ format('{0}/sycl-cts-ci:{1}', matrix.sycl-impl != 'computecpp' && 'khronosgroup' || 'scottstraughan', matrix.sycl-impl) }}
image: ${{ format('{0}/sycl-cts-ci:{1}-{2}', matrix.sycl-impl != 'computecpp' && 'khronosgroup' || 'scottstraughan', matrix.sycl-impl, matrix.version) }}
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
14 changes: 2 additions & 12 deletions ci/dpcpp.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
accessor
atomic
buffer
handler
hierarchical
id
invoke
item
math_builtin_api
multi_ptr
nd_item
range
exceptions
opencl_interop
reduction
specialization_constants
usm
3 changes: 3 additions & 0 deletions cmake/FindDPCPP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ else()
endif()
set(CMAKE_CXX_FLAGS "${DPCPP_FP_FLAG} ${CMAKE_CXX_FLAGS}")

# Disable range rounding feature to reduce # of SYCL kernels.
set(CMAKE_CXX_FLAGS "-D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__")

option(DPCPP_DISABLE_SYCL2020_DEPRECATION_WARNINGS
"Disable SYCL 2020 deprecation warnings" ON)
if(DPCPP_DISABLE_SYCL2020_DEPRECATION_WARNINGS)
Expand Down