From f02c880b40f0f253e44c1b276b25d15215837258 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Thu, 19 Dec 2024 23:35:46 +0200 Subject: [PATCH 1/6] [CI] Uplift compiler versions --- .github/workflows/cts_ci.yml | 8 ++++---- docker/dpcpp/Dockerfile | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cts_ci.yml b/.github/workflows/cts_ci.yml index 8964ae5bf..2e47c22f9 100644 --- a/.github/workflows/cts_ci.yml +++ b/.github/workflows/cts_ci.yml @@ -56,9 +56,9 @@ jobs: matrix: include: - sycl-impl: dpcpp - version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb + version: ca955e538171cb7b7eb07734dd5c2b958c84901c - sycl-impl: hipsycl - version: 3d8b1cd + version: 026e721 steps: - name: Checkout uses: actions/checkout@v3 @@ -114,9 +114,9 @@ jobs: matrix: include: - sycl-impl: dpcpp - version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb + version: ca955e538171cb7b7eb07734dd5c2b958c84901c - sycl-impl: hipsycl - version: 3d8b1cd + version: 026e721 env: container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }} parallel-build-jobs: 2 diff --git a/docker/dpcpp/Dockerfile b/docker/dpcpp/Dockerfile index 053d89d37..4ae08d5bf 100644 --- a/docker/dpcpp/Dockerfile +++ b/docker/dpcpp/Dockerfile @@ -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 + RUN export DEBIAN_FRONTEND=noninteractive && \ apt update && \ apt install -y --no-install-recommends \ From 784fd4724498d35557db91dfba6381bc0ca82d7e Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Thu, 19 Dec 2024 13:42:14 -0800 Subject: [PATCH 2/6] Fix hipSYCL commit hash. --- .github/workflows/cts_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cts_ci.yml b/.github/workflows/cts_ci.yml index 2e47c22f9..f441ded9e 100644 --- a/.github/workflows/cts_ci.yml +++ b/.github/workflows/cts_ci.yml @@ -58,7 +58,7 @@ jobs: - sycl-impl: dpcpp version: ca955e538171cb7b7eb07734dd5c2b958c84901c - sycl-impl: hipsycl - version: 026e721 + version: ba3fb96 steps: - name: Checkout uses: actions/checkout@v3 @@ -116,7 +116,7 @@ jobs: - sycl-impl: dpcpp version: ca955e538171cb7b7eb07734dd5c2b958c84901c - sycl-impl: hipsycl - version: 026e721 + version: ba3fb96 env: container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }} parallel-build-jobs: 2 From 9d38bf2ba99f237eb2ecdd4b6ed71a4d583f338c Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 20 Dec 2024 00:28:06 +0200 Subject: [PATCH 3/6] Install clang-18 packages --- docker/hipsycl/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/hipsycl/Dockerfile b/docker/hipsycl/Dockerfile index 625787eb0..198382009 100644 --- a/docker/hipsycl/Dockerfile +++ b/docker/hipsycl/Dockerfile @@ -6,6 +6,13 @@ FROM khronosgroup/sycl-cts-ci:common ARG IMPL_VERSION RUN test -n "$IMPL_VERSION" || ( echo "Error: IMPL_VERSION is not set"; exit 1 ) +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 + RUN export DEBIAN_FRONTEND=noninteractive && \ apt update && \ apt install -y --no-install-recommends \ From 711d3b966a5d0f24cbed2736f21ee717ba9dc119 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 20 Dec 2024 00:33:03 +0200 Subject: [PATCH 4/6] Install wget. --- docker/common/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/common/Dockerfile b/docker/common/Dockerfile index 20d29ba27..4bc87d4d8 100644 --- a/docker/common/Dockerfile +++ b/docker/common/Dockerfile @@ -6,6 +6,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt update && \ apt install -y --no-install-recommends \ build-essential \ + wget \ python3 \ git \ ca-certificates \ From 513c51f6d259be08c50a3323c04b40be25b7919d Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 20 Dec 2024 00:43:06 +0200 Subject: [PATCH 5/6] Install llvm.sh script dependencies. --- docker/hipsycl/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/hipsycl/Dockerfile b/docker/hipsycl/Dockerfile index 198382009..e427cf534 100644 --- a/docker/hipsycl/Dockerfile +++ b/docker/hipsycl/Dockerfile @@ -6,6 +6,12 @@ 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 && \ From 031fd53c4b752962a818a30c6b06e3b154bd4581 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Fri, 20 Dec 2024 08:44:23 -0800 Subject: [PATCH 6/6] Revert changes related to the uplift of the AdaptiveCpp compiler. --- .github/workflows/cts_ci.yml | 4 ++-- docker/common/Dockerfile | 1 - docker/hipsycl/Dockerfile | 13 ------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cts_ci.yml b/.github/workflows/cts_ci.yml index f441ded9e..629b4442f 100644 --- a/.github/workflows/cts_ci.yml +++ b/.github/workflows/cts_ci.yml @@ -58,7 +58,7 @@ jobs: - sycl-impl: dpcpp version: ca955e538171cb7b7eb07734dd5c2b958c84901c - sycl-impl: hipsycl - version: ba3fb96 + version: 3d8b1cd steps: - name: Checkout uses: actions/checkout@v3 @@ -116,7 +116,7 @@ jobs: - sycl-impl: dpcpp version: ca955e538171cb7b7eb07734dd5c2b958c84901c - sycl-impl: hipsycl - version: ba3fb96 + version: 3d8b1cd env: container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }} parallel-build-jobs: 2 diff --git a/docker/common/Dockerfile b/docker/common/Dockerfile index 4bc87d4d8..20d29ba27 100644 --- a/docker/common/Dockerfile +++ b/docker/common/Dockerfile @@ -6,7 +6,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt update && \ apt install -y --no-install-recommends \ build-essential \ - wget \ python3 \ git \ ca-certificates \ diff --git a/docker/hipsycl/Dockerfile b/docker/hipsycl/Dockerfile index e427cf534..625787eb0 100644 --- a/docker/hipsycl/Dockerfile +++ b/docker/hipsycl/Dockerfile @@ -6,19 +6,6 @@ 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 - RUN export DEBIAN_FRONTEND=noninteractive && \ apt update && \ apt install -y --no-install-recommends \