Skip to content

[CI] Drop support ext_oneapi_[level_zero|cuda|hip] in sycl_devices LIT parameter #16508

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

Merged
merged 1 commit into from
Jan 3, 2025
Merged

[CI] Drop support ext_oneapi_[level_zero|cuda|hip] in sycl_devices LIT parameter #16508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/sycl-linux-matrix-e2e-on-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
target_devices: ext_oneapi_hip:gpu
target_devices: hip:gpu

- name: Intel L0 GPU
runner: '["Linux", "gen12"]'
Expand All @@ -49,7 +49,7 @@ jobs:
runner: '["Linux", "cuda"]'
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
target_devices: ext_oneapi_cuda:gpu
target_devices: cuda:gpu
uses: ./.github/workflows/sycl-linux-run-tests.yml
with:
name: ${{ matrix.name }}
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
runner: '["aws-cuda_${{ github.run_id }}-${{ github.run_attempt }}"]'
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
target_devices: ext_oneapi_cuda:gpu
target_devices: cuda:gpu
env: ${{ inputs.env }}
ref: ${{ github.sha }}
merge_ref: ''
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sycl-linux-precommit-aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
runner: '["aws_cuda-${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}"]'
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
target_devices: ext_oneapi_cuda:gpu
target_devices: cuda:gpu
# No idea why but that seems to work and be in sync with the main
# pre-commit workflow.
ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sycl-linux-precommit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ jobs:
runner: '["Linux", "cuda"]'
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
target_devices: ext_oneapi_cuda:gpu
target_devices: cuda:gpu
- name: AMD/HIP
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
target_devices: ext_oneapi_hip:gpu
target_devices: hip:gpu
reset_intel_gpu: false
- name: E2E tests on Intel Arc A-Series Graphics
runner: '["Linux", "arc"]'
Expand Down Expand Up @@ -168,12 +168,12 @@ jobs:

# Do not install drivers on AMD and CUDA runners.
install_igc_driver: >-
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
${{ !contains(matrix.target_devices, 'cuda') &&
!contains(matrix.target_devices, 'hip') &&
contains(needs.detect_changes.outputs.filters, 'drivers') }}
install_dev_igc_driver: >-
${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
!contains(matrix.target_devices, 'ext_oneapi_hip') &&
${{ !contains(matrix.target_devices, 'cuda') &&
!contains(matrix.target_devices, 'hip') &&
matrix.use_igc_dev &&
(contains(needs.detect_changes.outputs.filters, 'devigccfg') || contains(needs.detect_changes.outputs.filters, 'drivers')) ||
'false' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sycl-linux-run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ on:
- 'opencl:gpu'
- 'opencl:fpga'
- 'level_zero:gpu'
- 'ext_oneapi_hip:gpu'
- 'hip:gpu'
tests_selector:
type: choice
options:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sycl-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
target_devices: ext_oneapi_hip:gpu
target_devices: hip:gpu
tests_selector: e2e

- name: Intel L0 GPU
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
target_devices: ext_oneapi_cuda:gpu
target_devices: cuda:gpu
ref: ${{ github.sha }}
merge_ref: ''

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sycl-post-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ jobs:
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
target_devices: ext_oneapi_hip:gpu
target_devices: hip:gpu
reset_intel_gpu: false
- name: E2E tests on Intel Ponte Vecchio GPU
runner: '["Linux", "pvc"]'
env: '{"LIT_FILTER_OUT":"ESIMD/unified_memory_api/"}'
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
target_devices: level_zero:gpu;opencl:gpu
extra_lit_opts: -j 50
- name: E2E tests with dev igc on Intel Ponte Vecchio GPU
runner: '["Linux", "pvc"]'
env: '{"LIT_FILTER_OUT":"ESIMD/unified_memory_api/"}'
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
target_devices: level_zero:gpu;opencl:gpu
use_igc_dev: true
extra_lit_opts: -j 50
# Performance tests below. Specifics:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sycl-rel-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
runner: '["Linux", "amdgpu"]'
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
target_devices: ext_oneapi_hip:gpu
target_devices: hip:gpu
tests_selector: e2e

- name: Intel L0 GPU
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
target_devices: ext_oneapi_cuda:gpu
target_devices: cuda:gpu
ref: draft-sycl-rel-6_0_0
merge_ref: ''

Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,6 @@ def open_check_file(file_name):
"Running on multiple devices, XFAIL-marked tests will be skipped on corresponding devices"
)

config.sycl_devices = [x.replace("ext_oneapi_", "") for x in config.sycl_devices]

available_devices = {
"opencl": ("cpu", "gpu", "fpga"),
"cuda": "gpu",
Expand Down
Loading