Skip to content

Commit 68840f1

Browse files
authored
[CI] Move testing to Ubuntu 24.04 everywhere (#16463)
Move testing to Ubuntu 24.04, as 22.04 support is being dropped in various places. Also, clean up the `oneAPI` image to not copy-paste the normal `build` image. I didn't change the nightly to publish 24.04 images (but it uses them for testing) because users might actually use that and I don't want to break them. --------- Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 05670b2 commit 68840f1

File tree

7 files changed

+22
-40
lines changed

7 files changed

+22
-40
lines changed

.github/workflows/sycl-containers.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ jobs:
7474
base_image=ghcr.io/intel/llvm/ubuntu2204_build
7575
base_tag=latest
7676
use_unstable_driver=false
77+
- name: Build + Intel Drivers Ubuntu 24.04 Docker image
78+
file: ubuntu2404_intel_drivers
79+
tag: alldeps
80+
build_args: |
81+
base_image=ghcr.io/intel/llvm/ubuntu2404_build
82+
base_tag=latest
83+
use_unstable_driver=false
7784
steps:
7885
- name: Checkout
7986
uses: actions/checkout@v4

.github/workflows/sycl-linux-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
build_image:
1515
type: string
1616
required: false
17-
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
17+
default: "ghcr.io/intel/llvm/ubuntu2404_build:latest"
1818
build_ref:
1919
type: string
2020
required: false

.github/workflows/sycl-linux-precommit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ jobs:
128128
include:
129129
- name: NVIDIA/CUDA
130130
runner: '["Linux", "cuda"]'
131-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
131+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
132132
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
133133
target_devices: ext_oneapi_cuda:gpu
134134
- name: AMD/HIP
135135
runner: '["Linux", "amdgpu"]'
136-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
136+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
137137
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
138138
target_devices: ext_oneapi_hip:gpu
139139
reset_intel_gpu: false
@@ -211,11 +211,11 @@ jobs:
211211
reset_intel_gpu: true
212212
- name: AMD system
213213
runner: '["Linux", "amdgpu"]'
214-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
214+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
215215
image_extra_opts: --device=/dev/dri --device=/dev/kfd
216216
- name: CUDA system
217217
runner: '["Linux", "cuda"]'
218-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
218+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
219219
image_extra_opts: --gpus all
220220
uses: ./.github/workflows/sycl-linux-run-tests.yml
221221
with:

.github/workflows/sycl-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
include:
4646
- name: AMD/HIP
4747
runner: '["Linux", "amdgpu"]'
48-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
48+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
4949
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
5050
target_devices: ext_oneapi_hip:gpu
5151
tests_selector: e2e
@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
name: CUDA E2E
158158
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
159-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
159+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
160160
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
161161
target_devices: ext_oneapi_cuda:gpu
162162
ref: ${{ github.sha }}

.github/workflows/sycl-post-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
build_cache_root: "/__w/llvm"
3636
build_cache_suffix: default
3737
build_artifact_suffix: default
38-
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
38+
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
3939
merge_ref: ''
4040

4141
e2e-lin:
@@ -56,7 +56,7 @@ jobs:
5656
reset_intel_gpu: true
5757
- name: AMD/HIP
5858
runner: '["Linux", "amdgpu"]'
59-
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
59+
image: ghcr.io/intel/llvm/ubuntu2404_build:latest
6060
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
6161
target_devices: ext_oneapi_hip:gpu
6262
reset_intel_gpu: false

devops/containers/ubuntu2404_build_oneapi.Dockerfile

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,21 @@
1-
FROM nvidia/cuda:12.6.3-devel-ubuntu24.04
1+
FROM ghcr.io/intel/llvm/ubuntu2404_build
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

55
USER root
66

7-
# Install SYCL prerequisites
8-
COPY scripts/install_build_tools.sh /install.sh
9-
RUN /install.sh
10-
11-
SHELL ["/bin/bash", "-ec"]
12-
137
# Install oneAPI
148

15-
# Make the directory if it doesn't exist yet.
16-
# This location is recommended by the distribution maintainers.
17-
RUN mkdir --parents --mode=0755 /etc/apt/keyrings
18-
# Download the key, convert the signing-key to a full
19-
# keyring required by apt and store in the keyring directory
20-
RUN wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
21-
gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
22-
# Add rocm repo
23-
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/6.3/ubuntu noble main" \
24-
| tee /etc/apt/sources.list.d/amdgpu.list && \
25-
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/6.3 noble main" \
26-
| tee --append /etc/apt/sources.list.d/rocm.list && \
27-
echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
28-
| tee /etc/apt/preferences.d/rocm-pin-600 && \
29-
echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
30-
| tee /etc/apt/preferences.d/rocm-pin-600 && \
31-
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor \
9+
RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor \
3210
| tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
3311
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
3412
| tee /etc/apt/sources.list.d/oneAPI.list
3513

3614
# Install the ROCM kernel driver and oneAPI
37-
RUN apt update && apt install -yqq rocm-dev intel-oneapi-compiler-dpcpp-cpp && \
15+
RUN apt update && apt install -yqq intel-oneapi-compiler-dpcpp-cpp-2025.0 && \
3816
apt-get clean && \
3917
rm -rf /var/lib/apt/lists/*
4018

41-
COPY scripts/create-sycl-user.sh /user-setup.sh
42-
RUN /user-setup.sh
43-
44-
COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh
45-
4619
USER sycl
4720

4821
ENTRYPOINT ["/docker_entrypoint.sh"]

sycl/doc/developer/DockerBKMs.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ The following containers are publicly available for DPC++ compiler development:
6363
setup for building DPC++ compiler from source.
6464
- `ghcr.io/intel/llvm/ubuntu2404_intel_drivers`: contains everything from the
6565
base container + pre-installed Intel drivers.
66-
The image comes in three flavors/tags:
66+
The image comes in four flavors/tags:
6767
* `latest`: Intel drivers are downloaded from release/tag and saved in
6868
dependencies.json. The drivers are tested/validated everytime we upgrade
6969
the driver.
7070
* `devigc`: Intel Graphics Compiler driver from github actions artifacts,
7171
other drivers are downloaded from release/tag and saved in dependencies.json.
7272
* `unstable`: Intel drivers are downloaded from release/latest.
73+
* `alldeps`: Includes the same Intel drivers as `latest`, as well as the
74+
development kits for NVidia/AMD from the `ubuntu2404_build` container.
7375
The drivers are installed as it is, not tested or validated.
7476
- `ghcr.io/intel/llvm/ubuntu2404_build`: has development kits installed for
7577
NVidia/AMD and can be used for building DPC++

0 commit comments

Comments
 (0)