dokery

.github/workflows/ur-build-hw.yml

@@ -26,6 +26,14 @@ on:
         required: false
         type: string
         default: OFF
+      docker_image:
+        required: true
+        type: string
+        default: ""
+      image_options:
+        required: true
+        type: string
+        default: ""
   workflow_dispatch:
     inputs:
       adapter_name:
@@ -51,22 +59,30 @@ on:
         required: false
         type: string
         default: OFF
+      docker_image:
+        required: true
+        type: string
+        default: ""
+      image_options:
+        required: true
+        type: string
+        default: ""
 
-permissions:
-  contents: read
+permissions: read-all
 
 env:
   UR_LOG_CUDA: "level:error;flush:error"
   UR_LOG_HIP: "level:error;flush:error"
   UR_LOG_LEVEL_ZERO: "level:error;flush:error"
   UR_LOG_NATIVE_CPU: "level:error;flush:error"
   UR_LOG_OPENCL: "level:error;flush:error"
+  CURRENT_DIR: $(pwd)
 
 jobs:
   adapter_build_hw:
     name: Build & CTS
     # run only on upstream; forks won't have the HW
-    if: github.repository == 'intel/llvm'
+    # if: github.repository == 'intel/llvm'
     strategy:
       fail-fast: false
       matrix:
@@ -83,6 +99,11 @@ jobs:
         compiler: [{c: gcc, cxx: g++}]
 
     runs-on: ${{inputs.runner_name}}
+    container:
+      image: ${{ inputs.docker_image }}
+      # TODO: options may differ for other GPU cards
+      options: ${{ inputs.image_options }}
+      # options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
 
     steps:
     # TODO:
@@ -94,27 +115,73 @@ jobs:
     - name: Checkout LLVM
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
+    # TODO: how other workflows (using dockers) deal with the path change?
+    #   also, note: I don't think it's needed anywhere now - I guess we can only use the relative paths...?
+    - name: Set working directory as environment variable
+      run: |
+        pwd
+        echo "${{github.workspace}}"
+
+    # TODO: move installation of python3-venv to docker
     # Latest distros do not allow global pip installation
-    - name: Install UR python dependencies in venv
-      working-directory: ${{github.workspace}}/unified-runtime
+    # - name: Install UR python dependencies in venv
+    #   working-directory: ./unified-runtime
+    #   run: |
+    #     sudo apt update
+    #     sudo apt install -y python3-venv
+    #     python3 -m venv .venv
+    #     . .venv/bin/activate
+    #     echo "${PWD}/.venv/bin" >> $GITHUB_PATH
+    #     pip install -r third_party/requirements.txt
+
+
+
+    - name: Download DPC++..
       run: |
-        python3 -m venv .venv
-        . .venv/bin/activate
-        echo "$PATH" >> $GITHUB_PATH
-        pip install -r third_party/requirements.txt
+        wget -O dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2025-03-25/sycl_linux.tar.gz
+        mkdir -p dpcpp_compiler
+        tar -xvf dpcpp_compiler.tar.gz -C dpcpp_compiler
 
-    - name: Download DPC++
+    # TODO_1: move this installation to docker? Perhaps there's other docker that already has these packages? we aren't the only ones using L0 ;-)
+    # TODO_2: if needed here, only install it for level zero jobs; and install required staff for other adapters under other 'if'
+    #
+    # it seems there's image for intel drivers (L0):
+    #   ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps JESLI ZADZIALA TO BEZ INSTAL 
+    # and for other adapters (HIP, CUDA):
+    #   ghcr.io/intel/llvm/ubuntu2204_build:latest
+    #   or
+    #   ghcr.io/intel/llvm/ubuntu2404_build:latest
+    # not sure on OpenCL and NativeCPU - to be checked.
+    # - name: Install Intel Level Zero GPU
+    #   # if: ${{ inputs.adapter_name == 'L0' || inputs.adapter_name == 'L0_V2' }}
+    #   run: |
+    #     wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
+    #       sudo gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics.gpg
+    #     echo "deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
+    #       sudo tee /etc/apt/sources.list.d/intel-gpu-jammy.list
+    #     sudo apt-get update
+    #     sudo apt-get install -y libze-intel-gpu1 libze1 libze-dev intel-opencl-icd
+    #     # libstdc++-12-dev
+    #
+
+    # - name: Install OpenCL
+    #   if: ${{ inputs.adapter_name == 'OPENCL' }}
+    #   run: |
+    #     wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
+    #     | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+    #     echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
+    #     sudo apt-get update
+    #     sudo apt-get install -y intel-oneapi-runtime-opencl intel-oneapi-base-toolkit
+    - name: check sycl-ls
       run: |
-        wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-12-12/sycl_linux.tar.gz
-        mkdir dpcpp_compiler
-        tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C dpcpp_compiler
+        find . /runtimes
 
     - name: Configure Unified Runtime project
-      working-directory: ${{github.workspace}}/unified-runtime
       # ">" is used to avoid adding "\" at the end of each line; this command is quite long
       run: >
         cmake
-        -B${{github.workspace}}/build
+        -S unified-runtime
+        -B build
         -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
         -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
         -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
@@ -126,34 +193,40 @@ jobs:
         ${{ matrix.adapter.other_name != '' && format('-DUR_BUILD_ADAPTER_{0}=ON', matrix.adapter.other_name) || '' }}
         -DUR_STATIC_LOADER=${{matrix.adapter.static_Loader}}
         -DUR_STATIC_ADAPTER_${{matrix.adapter.name}}=${{matrix.adapter.static_adapter}}
-        -DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++
-        -DUR_SYCL_LIBRARY_DIR=${{github.workspace}}/dpcpp_compiler/lib
-        -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
+        -DUR_DPCXX=./dpcpp_compiler/bin/clang++
+        -DUR_SYCL_LIBRARY_DIR=./dpcpp_compiler/lib
+        -DCMAKE_INSTALL_PREFIX=./install
         ${{ matrix.adapter.name == 'HIP' && '-DUR_CONFORMANCE_AMD_ARCH=gfx1030' || '' }}
         ${{ matrix.adapter.name == 'HIP' && '-DUR_HIP_PLATFORM=AMD' || '' }}
 
     - name: Build
       # This is so that device binaries can find the sycl runtime library
-      run: cmake --build ${{github.workspace}}/build -j $(nproc)
+      run: cmake --build build -j $(nproc)
 
     - name: Install
       # This is to check that install command does not fail
-      run: cmake --install ${{github.workspace}}/build
+      run: cmake --install build
 
-    - name: Test adapter specific
+    - name: Test adapter specific.
       env:
         ZE_ENABLE_LOADER_DEBUG_TRACE: 1
         ZE_DEBUG: 1
-      run: ctest -C ${{matrix.build_type}} --test-dir ${{github.workspace}}/build --output-on-failure -L "adapter-specific" -E "memcheck" --timeout 600 -VV
+      run: ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "adapter-specific" -E "memcheck" --timeout 600
       # Don't run adapter specific tests when building multiple adapters
       if: ${{ matrix.adapter.other_name == '' }}
 
-    - name: Test adapters
+    - name: Test adapters.
       env:
         ZE_ENABLE_LOADER_DEBUG_TRACE: 1
         ZE_DEBUG: 1
-      run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --test-dir ${{github.workspace}}/build --output-on-failure -L "conformance" --timeout 600 -VV
+        LD_LIBRARY_PATH: "./dpcpp_compiler/lib ./dpcpp_compiler/bin/sycl-ls"
+        UR_SYCL_LIBRARY_DIR: "./dpcpp_compiler/lib"
+      run: env UR_BUILD_ADAPTER_OPENCL=ON UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "conformance" --timeout 600
 
     - name: Get information about platform
+      env:
+        ZE_ENABLE_LOADER_DEBUG_TRACE: 1
+        ZE_DEBUG: 1
+        UR_SYCL_LIBRARY_DIR: "./dpcpp_compiler/lib"
       if: ${{ always() }}
-      run: ${{github.workspace}}/unified-runtime/.github/scripts/get_system_info.sh
+      run: ./unified-runtime/.github/scripts/get_system_info.sh

.github/workflows/ur-precommit.yml

@@ -5,6 +5,9 @@ name: Unified Runtime Pre Commit
 
 # Note: the trigger is copy-pasted from sycl-linux-precommit.yml - probably to be fine-tuned.
 on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
   # We rely on "Fork pull request workflows from outside collaborators" -
   # "Require approval for all outside collaborators" at
   # https://github.com/intel/llvm/settings/actions for security.
@@ -40,75 +43,123 @@ jobs:
     name: Detect Changes
     uses: ./.github/workflows/sycl-detect-changes.yml
 
-  source_checks:
-    name: Source Checks
-    needs: [detect_changes]
-    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
-    uses: ./.github/workflows/ur-source-checks.yml
+  # source_checks:
+  #   name: Source Checks
+  #   needs: [detect_changes]
+  #   if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
+  #   uses: ./.github/workflows/ur-source-checks.yml
 
   adapters:
     name: Adapters
-    needs: [detect_changes, source_checks]
-    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
+    # needs: [detect_changes, source_checks]
+    # if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
+    # needs: [detect_changes, source_checks]
+    # if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
     strategy:
       matrix:
+        include:
+          - name: L0
+            runner: UR_L0
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+          - name: L0_V2
+            runner: UR_L0
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+          - name: L0
+            runner: UR_L0
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+            static: ON
+          - name: L0
+            runner: UR_L0
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+            other_adapter: NATIVE_CPU
+          - name: HIP
+            runner: UR_HIP
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --cap-add=SYS_ADMIN 
+          - name: CUDA
+            runner: UR_CUDA
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --privileged --cap-add SYS_ADMIN --gpus all
+          - name: OPENCL
+            runner: UR_OPENCL
+            platform: "Intel(R) OpenCL"
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
+          - name: OPENCL
+            runner: UR_OPENCL
+            platform: "OPENCL:Intel(R) OpenCL"
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
+            other_adapter: NATIVE_CPU
+          - name: NATIVE_CPU
+            runner: UR_NATIVE_CPU
+            docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+
         # Extra native CPU jobs are here to force the loader to be used.
         # UR will not use the loader if there is only one target.
-        adapter: [
-          {name: L0, runner: UR_L0},
-          {name: L0_V2, runner: UR_L0},
-          {name: L0, runner: UR_L0, static: ON},
-          {name: OPENCL, runner: UR_OPENCL, platform: "Intel(R) OpenCL"},
-          {name: CUDA, runner: UR_CUDA},
-          {name: HIP, runner: UR_HIP},
-          {name: NATIVE_CPU, runner: UR_NATIVE_CPU},
-          {name: OPENCL, runner: UR_OPENCL, other_adapter: NATIVE_CPU, platform: "OPENCL:Intel(R) OpenCL"},
-          {name: L0, runner: UR_L0, other_adapter: NATIVE_CPU},
-        ]
+        # adapter: [
+        #   {name: L0, runner: UR_L0, docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"},
+        #   {name: L0_V2, runner: UR_L0},
+        #   {name: L0, runner: UR_L0, static: ON},
+        #   {name: OPENCL, runner: UR_OPENCL, platform: "Intel(R) OpenCL"},
+        #   {name: CUDA, runner: UR_CUDA},
+        #   {name: HIP, runner: UR_HIP},
+        #   {name: NATIVE_CPU, runner: UR_NATIVE_CPU},
+        #   {name: OPENCL, runner: UR_OPENCL, other_adapter: NATIVE_CPU, platform: "OPENCL:Intel(R) OpenCL"},
+        #   {name: L0, runner: UR_L0, other_adapter: NATIVE_CPU},
+        # ]
     uses: ./.github/workflows/ur-build-hw.yml
     with:
-      adapter_name: ${{ matrix.adapter.name }}
-      runner_name: ${{ matrix.adapter.runner }}
-      static_loader: ${{ matrix.adapter.static || 'OFF' }}
-      static_adapter: ${{ matrix.adapter.static || 'OFF' }}
-      platform: ${{ matrix.adapter.platform || '' }}
-      other_adapter_name: ${{ matrix.adapter.other_adapter || '' }}
+      adapter_name: ${{ matrix.name }}
+      runner_name: ${{ matrix.runner }}
+      static_loader: ${{ matrix.static || 'OFF' }}
+      static_adapter: ${{ matrix.static || 'OFF' }}
+      platform: ${{ matrix.platform || '' }}
+      other_adapter_name: ${{ matrix.other_adapter || '' }}
+      docker_image: ${{ matrix.docker_image }}
+      image_options: ${{ matrix.image_options || '' }}
 
-  macos:
-    name: MacOS build only
-    needs: [detect_changes, source_checks]
-    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
-    strategy:
-      matrix:
-        os: ['macos-13']
-    runs-on: ${{matrix.os}}
+  # macos:
+  #   name: MacOS build only
+  #   needs: [detect_changes, source_checks]
+  #   if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
+  #   strategy:
+  #     matrix:
+  #       os: ['macos-13']
+  #   runs-on: ${{matrix.os}}
+
+  #   steps:
+  #   - name: Checkout LLVM
+  #     uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    steps:
-    - name: Checkout LLVM
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.0.0
-      with:
-        python-version: 3.9
+    # - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.0.0
+    #   with:
+    #     python-version: 3.9
 
-    - name: Install prerequisites
-      working-directory: ${{github.workspace}}/unified-runtime
-      run: python3 -m pip install -r third_party/requirements.txt
+  #   - name: Install prerequisites
+  #     working-directory: ${{github.workspace}}/unified-runtime
+  #     run: python3 -m pip install -r third_party/requirements.txt
 
-    - name: Install hwloc
-      run: brew install hwloc
+  #   - name: Install hwloc
+  #     run: brew install hwloc
 
-    - name: Configure Unified Runtime project
-      working-directory: ${{github.workspace}}/unified-runtime
-      run: >
-        cmake
-        -B${{github.workspace}}/build
-        -DUR_ENABLE_TRACING=ON
-        -DUR_DEVELOPER_MODE=ON
-        -DCMAKE_BUILD_TYPE=Release
-        -DUR_BUILD_TESTS=ON
-        -DUR_FORMAT_CPP_STYLE=ON
-        -DUMF_ENABLE_POOL_TRACKING=ON
+  #   - name: Configure Unified Runtime project
+  #     working-directory: ${{github.workspace}}/unified-runtime
+  #     run: >
+  #       cmake
+  #       -B${{github.workspace}}/build
+  #       -DUR_ENABLE_TRACING=ON
+  #       -DUR_DEVELOPER_MODE=ON
+  #       -DCMAKE_BUILD_TYPE=Release
+  #       -DUR_BUILD_TESTS=ON
+  #       -DUR_FORMAT_CPP_STYLE=ON
+  #       -DUMF_ENABLE_POOL_TRACKING=ON
 
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
+  #   - name: Build
+  #     run: cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)