Skip to content
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

[CI] Uplift DPC++ compiler version #1012

Merged
merged 8 commits into from
Dec 21, 2024
Merged

[CI] Uplift DPC++ compiler version #1012

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f02c880
[CI] Uplift compiler versions
bader Dec 19, 2024
fdbc36e
Merge branch 'main' into compilers-uplift
bader Dec 19, 2024
784fd47
Fix hipSYCL commit hash.
bader Dec 19, 2024
9d38bf2
Install clang-18 packages
bader Dec 19, 2024
711d3b9
Install wget.
bader Dec 19, 2024
513c51f
Install llvm.sh script dependencies.
bader Dec 19, 2024
031fd53
Revert changes related to the uplift of the AdaptiveCpp compiler.
bader Dec 20, 2024
b4b5f23
Merge branch 'main' into compilers-uplift
bader Dec 20, 2024
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/cts_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
matrix:
include:
- sycl-impl: dpcpp
version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb
version: ca955e538171cb7b7eb07734dd5c2b958c84901c
- sycl-impl: hipsycl
version: 3d8b1cd
version: ba3fb96
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -114,9 +114,9 @@ jobs:
matrix:
include:
- sycl-impl: dpcpp
version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb
version: ca955e538171cb7b7eb07734dd5c2b958c84901c
- sycl-impl: hipsycl
version: 3d8b1cd
version: ba3fb96
env:
container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
parallel-build-jobs: 2
Expand Down
1 change: 1 addition & 0 deletions docker/common/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt update && \
apt install -y --no-install-recommends \
build-essential \
wget \
python3 \
git \
ca-certificates \
Expand Down
3 changes: 3 additions & 0 deletions docker/dpcpp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ ARG IMPL_VERSION

FROM ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers-$IMPL_VERSION

# Make sure that apt is executed with root previlegies
USER root
psalz marked this conversation as resolved.
Show resolved Hide resolved

RUN export DEBIAN_FRONTEND=noninteractive && \
apt update && \
apt install -y --no-install-recommends \
Expand Down
13 changes: 13 additions & 0 deletions docker/hipsycl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ FROM khronosgroup/sycl-cts-ci:common
ARG IMPL_VERSION
RUN test -n "$IMPL_VERSION" || ( echo "Error: IMPL_VERSION is not set"; exit 1 )

RUN apt update && \
apt install -y --no-install-recommends \
lsb-release \
software-properties-common \
gnupg

RUN wget https://apt.llvm.org/llvm.sh && \
chmod +x llvm.sh && \
./llvm.sh 18 && \
apt update && \
apt install -y --no-install-recommends \
libclang-18-dev clang-tools-18 libomp-18-dev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the switch to 24.04 as the base image in #874 we can just install LLVM 18 though apt.


RUN export DEBIAN_FRONTEND=noninteractive && \
apt update && \
apt install -y --no-install-recommends \
Expand Down
Loading