From 876c50f4cf440912a6082b2477bdef831f87d24a Mon Sep 17 00:00:00 2001 From: Pavel V Chupin Date: Tue, 6 Dec 2022 16:38:40 -0800 Subject: [PATCH 1/2] [CI][3/3] Finalize Ubuntu 20->22 migration Follow up on #7362 * Erase Ubuntu 20 containers build * Move everywhere to Ubuntu 22 containers by default * Update clang version that we use in build to Ubuntu 22 version (jammy) * Update documentation --- .github/workflows/sycl_containers.yaml | 111 ------------------ .github/workflows/sycl_gen_test_matrix.yml | 6 +- .../workflows/sycl_linux_build_and_test.yml | 2 +- .github/workflows/sycl_nightly.yml | 61 ---------- .github/workflows/sycl_post_commit.yml | 4 +- .github/workflows/sycl_precommit.yml | 2 +- devops/containers/ubuntu2004_base.Dockerfile | 26 ---- devops/containers/ubuntu2004_build.Dockerfile | 37 ------ .../ubuntu2004_intel_drivers.Dockerfile | 28 ----- .../ubuntu2004_preinstalled.Dockerfile | 14 --- devops/scripts/generate_test_matrix.js | 12 +- sycl/doc/GetStartedGuide.md | 2 +- sycl/doc/developer/DockerBKMs.md | 8 +- 13 files changed, 18 insertions(+), 295 deletions(-) delete mode 100644 devops/containers/ubuntu2004_base.Dockerfile delete mode 100644 devops/containers/ubuntu2004_build.Dockerfile delete mode 100644 devops/containers/ubuntu2004_intel_drivers.Dockerfile delete mode 100644 devops/containers/ubuntu2004_preinstalled.Dockerfile diff --git a/.github/workflows/sycl_containers.yaml b/.github/workflows/sycl_containers.yaml index d618617ed166..3a9338af1254 100644 --- a/.github/workflows/sycl_containers.yaml +++ b/.github/workflows/sycl_containers.yaml @@ -22,117 +22,6 @@ on: - '.github/workflows/sycl_containers.yaml' jobs: - base_image_ubuntu2004: - if: github.repository == 'intel/llvm' - name: Base Ubuntu 20.04 Docker image - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Build and Push Container - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ubuntu2004_base - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: | - ghcr.io/${{ github.repository }}/ubuntu2004_base:${{ github.sha }} - ghcr.io/${{ github.repository }}/ubuntu2004_base:latest - build_image_ubuntu2004: - if: github.repository == 'intel/llvm' - name: Build Ubuntu Docker image - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Build and Push Container - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ubuntu2004_build - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: | - ghcr.io/${{ github.repository }}/ubuntu2004_build:${{ github.sha }} - ghcr.io/${{ github.repository }}/ubuntu2004_build:latest - - # This job produces a Docker container with the latest versions of Intel - # drivers, that can be found on GitHub. - drivers_image_ubuntu2004: - if: github.repository == 'intel/llvm' - name: Intel Drivers Ubuntu 20.04 Docker image - runs-on: ubuntu-latest - needs: base_image_ubuntu2004 - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Get dependencies configuration - id: deps - run: | - DEPS=`cat devops/dependencies.json` - DEPS="${DEPS//$'\r'/''}" - DEPS="${DEPS//$'\n'/' '}" - echo $DEPS - echo "deps=$DEPS" >>$GITHUB_OUTPUT - - name: Build and Push Container - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ubuntu2004_intel_drivers - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: | - ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }} - ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest - build-args: | - compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}} - igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}} - cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}} - level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}} - tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}} - fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}} - cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}} - - # This job produces a Docker container with the latest versions of Intel - # drivers, that can be found on GitHub. - drivers_image_ubuntu2004_unstable: - if: github.repository == 'intel/llvm' - name: Intel Drivers (unstable) Ubuntu 20.04 Docker image - runs-on: ubuntu-latest - needs: base_image_ubuntu2004 - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Get dependencies configuration - id: deps - run: | - DEPS=`cat devops/dependencies.json` - DEPS="${DEPS//$'\r'/''}" - DEPS="${DEPS//$'\n'/' '}" - echo $DEPS - echo "deps=$DEPS" >>$GITHUB_OUTPUT - - name: Build and Push Container - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ubuntu2004_intel_drivers - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: | - ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }} - ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable - # build-args:empty , so we automatically take the "latest" tags as - # unstable - base_image_ubuntu2204: if: github.repository == 'intel/llvm' name: Base Ubuntu 22.04 Docker image diff --git a/.github/workflows/sycl_gen_test_matrix.yml b/.github/workflows/sycl_gen_test_matrix.yml index 9b31eb215ece..762dee4c9763 100644 --- a/.github/workflows/sycl_gen_test_matrix.yml +++ b/.github/workflows/sycl_gen_test_matrix.yml @@ -6,15 +6,15 @@ on: intel_drivers_image: type: string required: false - default: "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest" + default: "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest" amdgpu_image: type: string required: false - default: "ghcr.io/intel/llvm/ubuntu2004_build:latest" + default: "ghcr.io/intel/llvm/ubuntu2204_build:latest" cuda_image: type: string required: false - default: "ghcr.io/intel/llvm/ubuntu2004_build:latest" + default: "ghcr.io/intel/llvm/ubuntu2204_build:latest" lts_config: type: string required: true diff --git a/.github/workflows/sycl_linux_build_and_test.yml b/.github/workflows/sycl_linux_build_and_test.yml index a49bb0153059..5128fb85c9cd 100644 --- a/.github/workflows/sycl_linux_build_and_test.yml +++ b/.github/workflows/sycl_linux_build_and_test.yml @@ -14,7 +14,7 @@ on: build_image: type: string required: false - default: "ghcr.io/intel/llvm/ubuntu2004_build:latest" + default: "ghcr.io/intel/llvm/ubuntu2204_build:latest" build_ref: type: string required: false diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml index 3b046a552c61..e2a9bdb939e5 100644 --- a/.github/workflows/sycl_nightly.yml +++ b/.github/workflows/sycl_nightly.yml @@ -6,7 +6,6 @@ on: - cron: '0 3 * * *' pull_request: paths: - - 'devops/containers/ubuntu2004_preinstalled.Dockerfile' - 'devops/containers/ubuntu2204_preinstalled.Dockerfile' - '.github/workflows/sycl_nightly.yml' @@ -17,16 +16,6 @@ jobs: with: lts_config: "ocl_gen9;ocl_x64" - ubuntu2004_build_test: - if: github.repository == 'intel/llvm' - uses: ./.github/workflows/sycl_linux_build_and_test.yml - needs: test_matrix - secrets: inherit - with: - build_cache_root: "/__w/" - build_artifact_suffix: default - build_configure_extra_args: '' - ubuntu2204_build_test: if: github.repository == 'intel/llvm' uses: ./.github/workflows/sycl_linux_build_and_test.yml @@ -36,18 +25,6 @@ jobs: build_cache_root: "/__w/" build_artifact_suffix: default build_configure_extra_args: '' - build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest" - - ubuntu2004_opaque_pointers_build_test: - if: github.repository == 'intel/llvm' - uses: ./.github/workflows/sycl_linux_build_and_test.yml - needs: test_matrix - secrets: inherit - with: - build_cache_root: "/__w/" - build_cache_suffix: opaque_pointers - build_artifact_suffix: opaque_pointers - build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE" ubuntu2204_opaque_pointers_build_test: if: github.repository == 'intel/llvm' @@ -59,50 +36,12 @@ jobs: build_cache_suffix: opaque_pointers build_artifact_suffix: opaque_pointers build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE" - build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest" windows_default: name: Windows if: github.repository == 'intel/llvm' uses: ./.github/workflows/sycl_windows_build_and_test.yml - ubuntu2004_docker_build_push: - if: github.repository == 'intel/llvm' - runs-on: ubuntu-latest - needs: ubuntu2004_build_test - steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 - with: - name: sycl_linux_default - path: devops/ - - name: Build and Push Container (with drivers) - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ubuntu2004_preinstalled - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - build-args: | - base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers - base_tag=latest - tags: | - ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }} - ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest - - name: Build and Push Container (no drivers) - uses: ./devops/actions/build_container - with: - push: ${{ github.event_name != 'pull_request' }} - file: ubuntu2004_preinstalled - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - build-args: | - base_image=ghcr.io/intel/llvm/ubuntu2004_base - base_tag=latest - tags: | - ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }} - ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers - ubuntu2204_docker_build_push: if: github.repository == 'intel/llvm' runs-on: ubuntu-latest diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml index c149effcb2e5..c0d46a2f8b38 100644 --- a/.github/workflows/sycl_post_commit.yml +++ b/.github/workflows/sycl_post_commit.yml @@ -46,7 +46,7 @@ jobs: linux_clang_shared_libs: # TODO use nightly images when Docker containers are available name: Linux + Clang + Shared libs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.repository == 'intel/llvm' steps: - uses: actions/checkout@v3 @@ -65,7 +65,7 @@ jobs: - name: Configure run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" + sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" sudo apt-get update sudo apt-get install -y clang-15 export CC="clang-15" diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index 8084284735cb..faf28281f771 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -30,7 +30,7 @@ jobs: lint: runs-on: ubuntu-latest container: - image: ghcr.io/intel/llvm/sycl_ubuntu2004_nightly:no-drivers + image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers steps: - name: 'PR commits + 1' run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" diff --git a/devops/containers/ubuntu2004_base.Dockerfile b/devops/containers/ubuntu2004_base.Dockerfile deleted file mode 100644 index 4776079db0d4..000000000000 --- a/devops/containers/ubuntu2004_base.Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:20.04 - -ENV DEBIAN_FRONTEND=noninteractive - -USER root - -# Install SYCL prerequisites -COPY scripts/install_build_tools.sh /install.sh -RUN /install.sh - -# By default Ubuntu sets an arbitrary UID value, that is different from host -# system. When CI passes default UID value of 1001, some of LLVM tools fail to -# discover user home directory and fail a few LIT tests. Fixes UID and GID to -# 1001, that is used as default by GitHub Actions. -RUN groupadd -g 1001 sycl && useradd sycl -u 1001 -g 1001 -m -s /bin/bash -# Add sycl user to video group so that it can access GPU -RUN usermod -aG video sycl -# Allow sycl user to run as sudo -RUN echo "sycl ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -COPY actions/cached_checkout /actions/cached_checkout -COPY actions/cleanup /actions/cleanup -COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh -COPY scripts/install_drivers.sh /opt/install_drivers.sh - -ENTRYPOINT ["/docker_entrypoint.sh"] diff --git a/devops/containers/ubuntu2004_build.Dockerfile b/devops/containers/ubuntu2004_build.Dockerfile deleted file mode 100644 index de5f73fa3ace..000000000000 --- a/devops/containers/ubuntu2004_build.Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM nvidia/cuda:11.7.0-devel-ubuntu20.04 - -ENV DEBIAN_FRONTEND=noninteractive - -USER root - -# Install Nvidia keys -# https://forums.developer.nvidia.com/t/notice-cuda-linux-repository-key-rotation/212772 -RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub - -# Install SYCL prerequisites -COPY scripts/install_build_tools.sh /install.sh -RUN /install.sh - -# Install AMD ROCm -RUN apt install -yqq libnuma-dev wget gnupg2 && \ - wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - && \ - echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ ubuntu main' | tee /etc/apt/sources.list.d/rocm.list && \ - apt update && \ - apt install -yqq rocm-dev && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# By default Ubuntu sets an arbitrary UID value, that is different from host -# system. When CI passes default UID value of 1001, some of LLVM tools fail to -# discover user home directory and fail a few LIT tests. Fixes UID and GID to -# 1001, that is used as default by GitHub Actions. -RUN groupadd -g 1001 sycl && useradd sycl -u 1001 -g 1001 -m -s /bin/bash -# Add sycl user to video group so that it can access GPU -RUN usermod -aG video sycl - -COPY actions/cached_checkout /actions/cached_checkout -COPY actions/cleanup /actions/cleanup -COPY scripts/docker_entrypoint.sh /docker_entrypoint.sh - -ENTRYPOINT ["/docker_entrypoint.sh"] - diff --git a/devops/containers/ubuntu2004_intel_drivers.Dockerfile b/devops/containers/ubuntu2004_intel_drivers.Dockerfile deleted file mode 100644 index 3d964a465b68..000000000000 --- a/devops/containers/ubuntu2004_intel_drivers.Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -ARG base_tag=latest -ARG base_image=ghcr.io/intel/llvm/ubuntu2004_base - -FROM $base_image:$base_tag - -ENV DEBIAN_FRONTEND=noninteractive - -ARG compute_runtime_tag=latest -ARG igc_tag=latest -ARG cm_tag=latest -ARG level_zero_tag=latest -ARG tbb_tag=latest -ARG fpgaemu_tag=latest -ARG cpu_tag=latest - -RUN apt update && apt install -yqq wget - -COPY scripts/get_release.py / -COPY scripts/install_drivers.sh / - -RUN mkdir /runtimes -ENV INSTALL_LOCATION=/runtimes -RUN /install_drivers.sh --all - -COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh - -ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"] - diff --git a/devops/containers/ubuntu2004_preinstalled.Dockerfile b/devops/containers/ubuntu2004_preinstalled.Dockerfile deleted file mode 100644 index 05208d415143..000000000000 --- a/devops/containers/ubuntu2004_preinstalled.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -ARG base_tag=latest -ARG base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers - -FROM $base_image:$base_tag - -COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh -RUN mkdir -p /opt/sycl -ADD llvm_sycl.tar.xz /opt/sycl - -ENV PATH /opt/sycl/bin:$PATH -ENV LD_LIBRARY_PATH /opt/sycl/lib:$LD_LIBRARY_PATH - -ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"] - diff --git a/devops/scripts/generate_test_matrix.js b/devops/scripts/generate_test_matrix.js index 4d90f8e89a9a..ba05a322c4de 100644 --- a/devops/scripts/generate_test_matrix.js +++ b/devops/scripts/generate_test_matrix.js @@ -63,11 +63,11 @@ module.exports = ({core, process}) => { } if (needsDrivers) { ltsString = ltsString.replaceAll( - "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest", - "ghcr.io/intel/llvm/ubuntu2004_base:latest"); + "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest", + "ghcr.io/intel/llvm/ubuntu2204_base:latest"); ltsAWSString = ltsAWSString.replaceAll( - "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest", - "ghcr.io/intel/llvm/ubuntu2004_base:latest"); + "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest", + "ghcr.io/intel/llvm/ubuntu2204_base:latest"); } core.setOutput('lts_matrix', ltsString); @@ -105,8 +105,8 @@ module.exports = ({core, process}) => { } if (needsDrivers) { ctsString = ctsString.replaceAll( - "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest", - "ghcr.io/intel/llvm/ubuntu2004_base:latest"); + "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest", + "ghcr.io/intel/llvm/ubuntu2204_base:latest"); } core.setOutput('cts_matrix', ctsString); diff --git a/sycl/doc/GetStartedGuide.md b/sycl/doc/GetStartedGuide.md index e48e16045845..2b8a7e2bc554 100644 --- a/sycl/doc/GetStartedGuide.md +++ b/sycl/doc/GetStartedGuide.md @@ -51,7 +51,7 @@ Alternatively, you can use a Docker image that has everything you need for build pre-installed: ``` -docker run --name sycl_build -it -v /local/workspace/dir/:/src ghcr.io/intel/llvm/ubuntu2004_base /bin/bash +docker run --name sycl_build -it -v /local/workspace/dir/:/src ghcr.io/intel/llvm/ubuntu2204_base /bin/bash ``` This command will start a terminal session, from which you can proceed with the diff --git a/sycl/doc/developer/DockerBKMs.md b/sycl/doc/developer/DockerBKMs.md index 928c1f82000f..1c64153fc607 100644 --- a/sycl/doc/developer/DockerBKMs.md +++ b/sycl/doc/developer/DockerBKMs.md @@ -36,11 +36,11 @@ identical for Docker and Podman. Choose whatever is available on your system. The following containers are publicly available for DPC++ compiler development: -- `ghcr.io/intel/llvm/ubuntu2004_base`: contains basic environment setup for +- `ghcr.io/intel/llvm/ubuntu2204_base`: contains basic environment setup for building DPC++ compiler from source. -- `ghcr.io/intel/llvm/ubuntu2004_intel_drivers`: contains everything from the +- `ghcr.io/intel/llvm/ubuntu2204_intel_drivers`: contains everything from the base container + pre-installed Intel drivers. -- `ghcr.io/intel/llvm/sycl_ubuntu2004_nightly`: contains the latest successfully +- `ghcr.io/intel/llvm/sycl_ubuntu2204_nightly`: contains the latest successfully built nightly build of DPC++ compiler. The image comes in two flavors: with pre-installed Intel drivers (`latest`) and without them (`no-drivers`). @@ -158,7 +158,7 @@ Docker containers can be built with the following command: docker build -f path/to/devops/containers/file.Dockerfile path/to/devops/ ``` -The `ubuntu2004_preinstalled.Dockerfile` script expects `llvm_sycl.tar.xz` file +The `ubuntu2204_preinstalled.Dockerfile` script expects `llvm_sycl.tar.xz` file to be present in `devops/` directory. Containers other than base provide several configurable arguments, the most From 4e33778df16e02398d029d0858d88140b2dc2859 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Thu, 6 Apr 2023 14:51:49 -0700 Subject: [PATCH 2/2] Update docs and CI scripts. --- .github/workflows/sycl_containers.yaml | 8 ++++---- .github/workflows/sycl_precommit.yml | 2 +- CONTRIBUTING.md | 2 +- sycl/doc/GetStartedGuide.md | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sycl_containers.yaml b/.github/workflows/sycl_containers.yaml index ad4d24755e72..1115d5ef4323 100644 --- a/.github/workflows/sycl_containers.yaml +++ b/.github/workflows/sycl_containers.yaml @@ -25,7 +25,7 @@ jobs: base_image_ubuntu2204: if: github.repository == 'intel/llvm' name: Base Ubuntu 22.04 Docker image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -44,7 +44,7 @@ jobs: build_image_ubuntu2204: if: github.repository == 'intel/llvm' name: Build Ubuntu Docker image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -66,7 +66,7 @@ jobs: drivers_image_ubuntu2204: if: github.repository == 'intel/llvm' name: Intel Drivers Ubuntu 22.04 Docker image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: base_image_ubuntu2204 steps: - name: Checkout @@ -104,7 +104,7 @@ jobs: drivers_image_ubuntu2204_unstable: if: github.repository == 'intel/llvm' name: Intel Drivers (unstable) Ubuntu 22.04 Docker image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: base_image_ubuntu2204 steps: - name: Checkout diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index ec834984b53f..33e6601d2386 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -28,7 +28,7 @@ permissions: jobs: lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers steps: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 49bb77a39d94..a49a939e848c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,7 +34,7 @@ To contribute: integrated into your workflow to ensure formatting and stylistic compliance of your changes. To avoid code formatting misalignment with GitHub Actions check we recommend using 10 version of clang-format tool - (default version on Ubuntu 20.04). + (default version on Ubuntu 22.04). - use ```bash diff --git a/sycl/doc/GetStartedGuide.md b/sycl/doc/GetStartedGuide.md index ce0f0736d329..ac0a1f906de9 100644 --- a/sycl/doc/GetStartedGuide.md +++ b/sycl/doc/GetStartedGuide.md @@ -289,7 +289,7 @@ the Linux DPC++ toolchain, but add the `--enable-esimd-emulator'. Enabling this flag requires following packages installed. -* Ubuntu 20.04 +* Ubuntu 22.04 * libva-dev / 2.7.0-2 * libffi-dev / 3.3-4 * libtool @@ -299,7 +299,7 @@ Enabling this flag requires following packages installed. * libva * libva-devel -Currently, this feature was tested and verified on Ubuntu 20.04 +Currently, this feature was tested and verified on Ubuntu 22.04 environment. ### Build DPC++ toolchain with support for runtime kernel fusion @@ -860,7 +860,7 @@ which contains all the symbols required. ### CUDA back-end limitations * Backend is only supported on Linux -* The only combination tested is Ubuntu 18.04 with CUDA 10.2 using a Titan RTX +* The only combination tested is Ubuntu 22.04 with CUDA 11.7 using a Titan RTX GPU (SM 71), but it should work on any GPU compatible with SM 50 or above * The NVIDIA OpenCL headers conflict with the OpenCL headers required for this project and may cause compilation issues on some platforms