Merge pull request #712 from KhronosGroup/dpcpp-container

Base DPC++ docker container on the image from intel/llvm.
KhronosGroup · Jun 20, 2023 · 3493cc7 · 3493cc7
2 parents f3dce2b + 1c199ba
commit 3493cc7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/cts_ci.yml b/.github/workflows/cts_ci.yml
@@ -59,7 +59,7 @@ jobs:
           # - sycl-impl: computecpp
           # version: 2.11.0
           - sycl-impl: dpcpp
-            version: 0267c1b
+            version: 83f877975c97acdb38d84f94dc146571cd522e0e
           - sycl-impl: hipsycl
             version: 3d8b1cd
     steps:
@@ -119,7 +119,7 @@ jobs:
           - sycl-impl: computecpp
             version: 2.11.0
           - sycl-impl: dpcpp
-            version: 0267c1b
+            version: 83f877975c97acdb38d84f94dc146571cd522e0e
           - sycl-impl: hipsycl
             version: 3d8b1cd
     env:

diff --git a/docker/dpcpp/Dockerfile b/docker/dpcpp/Dockerfile
@@ -1,24 +1,7 @@
-# DPC++ version (git revision) to install
+# DPC++ build version (git revision) to install
+# Go to https://github.com/intel/llvm/pkgs/container/llvm%2Fsycl_ubuntu2204_nightly to see avilable docker image tags
 ARG IMPL_VERSION
 
-FROM khronosgroup/sycl-cts-ci:common
-
-ARG IMPL_VERSION
-RUN test -n "$IMPL_VERSION" || ( echo "Error: IMPL_VERSION is not set"; exit 1 )
-
-RUN git clone https://github.com/intel/llvm.git \
-      --branch=sycl --single-branch --shallow-since=2021-09-01 \
-      --recurse-submodules /tmp/dpcpp && \
-    cd /tmp/dpcpp && \
-    git checkout $IMPL_VERSION && \
-    python3 /tmp/dpcpp/buildbot/configure.py \
-      --src-dir=/tmp/dpcpp \
-      --obj-dir=/tmp/build \
-      --build-type=Release \
-      --cmake-opt=-DCMAKE_INSTALL_PREFIX=/sycl && \
-    python3 /tmp/dpcpp/buildbot/compile.py \
-      --src-dir=/tmp/dpcpp \
-      --obj-dir=/tmp/build && \
-    rm -rf /tmp/dpcpp /tmp/build
+FROM ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers-$IMPL_VERSION
 
 COPY configure.sh /scripts/
diff --git a/docker/dpcpp/configure.sh b/docker/dpcpp/configure.sh
@@ -5,8 +5,8 @@ set -o errexit -o pipefail -o noclobber -o nounset
 cmake . -G Ninja -B build \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
     -DSYCL_IMPLEMENTATION=DPCPP \
-    -DDPCPP_INSTALL_DIR=/sycl \
-    -DCMAKE_CXX_COMPILER=/sycl/bin/clang++ \
+    -DDPCPP_INSTALL_DIR=/opt/sycl \
+    -DCMAKE_CXX_COMPILER=/opt/sycl/bin/clang++ \
     -DCMAKE_BUILD_TYPE=Release \
     -DSYCL_CTS_ENABLE_FULL_CONFORMANCE=0 \
     -DSYCL_CTS_ENABLE_DEPRECATED_FEATURES_TESTS=1 \