Skip to content

Commit

Permalink
[CI] Add remaining Ubuntu 24.04 Docker containers
Browse files Browse the repository at this point in the history
Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
  • Loading branch information
sarnex committed Dec 23, 2024
1 parent 1b4e286 commit 7496edb
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/sycl-containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@ jobs:
file: ubuntu2404_base
tag: latest
build_args: ""
- name: Build Ubuntu Docker image
- name: Build Ubuntu 22.04 Docker image
file: ubuntu2204_build
tag: latest
build_args: ""
- name: Build Ubuntu 24.04 Docker image
file: ubuntu2404_build
tag: latest
build_args: ""
- name: Build Ubuntu 24.04 oneAPI Docker image
file: ubuntu2404_build_oneapi
tag: latest
Expand Down
42 changes: 42 additions & 0 deletions devops/containers/ubuntu2404_build.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
FROM nvidia/cuda:12.6.3-devel-ubuntu24.04

ENV DEBIAN_FRONTEND=noninteractive

USER root

# Install SYCL prerequisites
COPY scripts/install_build_tools.sh /install.sh
RUN /install.sh

SHELL ["/bin/bash", "-ec"]

# Make the directory if it doesn't exist yet.
# This location is recommended by the distribution maintainers.
RUN mkdir --parents --mode=0755 /etc/apt/keyrings
# Download the key, convert the signing-key to a full
# keyring required by apt and store in the keyring directory
RUN wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \
gpg --dearmor | tee /etc/apt/keyrings/rocm.gpg > /dev/null && \
# Add rocm repo
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/6.3/ubuntu noble main" \
| tee /etc/apt/sources.list.d/amdgpu.list && \
echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/6.3 noble main" \
| tee --append /etc/apt/sources.list.d/rocm.list && \
echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
| tee /etc/apt/preferences.d/rocm-pin-600 && \
echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' \
| tee /etc/apt/preferences.d/rocm-pin-600
# Install the ROCM kernel driver
RUN apt update && apt install -yqq rocm-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

COPY scripts/create-sycl-user.sh /user-setup.sh
RUN /user-setup.sh

COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh

USER sycl

ENTRYPOINT ["/docker_entrypoint.sh"]

10 changes: 7 additions & 3 deletions sycl/doc/developer/DockerBKMs.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,13 @@ The following containers are publicly available for DPC++ compiler development:
* `unstable`: Intel drivers are downloaded from release/latest.
The drivers are installed as it is, not tested or validated.
- `ghcr.io/intel/llvm/ubuntu2204_build`: has development kits installed for
NVidia/AMD and can be used for building DPC++ compiler from source with all
backends enabled or for end-to-end testing with HIP/CUDA on machines with
corresponding GPUs available.
NVidia/AMD, is based on Ubuntu 22.04, and can be used for building DPC++
compiler from source with all backends enabled or for end-to-end testing
with HIP/CUDA on machines with corresponding GPUs available.
- `ghcr.io/intel/llvm/ubuntu2404_build`: has development kits installed for
NVidia/AMD, is based on Ubuntu 24.04, and can be used for building DPC++
compiler from source with all backends enabled or for end-to-end testing
with HIP/CUDA on machines with corresponding GPUs available.
- `ghcr.io/intel/llvm/sycl_ubuntu2204_nightly`: contains the latest successfully
built nightly build of DPC++ compiler. The image comes in three flavors:
with pre-installed Intel drivers (`latest`), without them (`no-drivers`) and
Expand Down

0 comments on commit 7496edb

Please sign in to comment.