From 2fc429bbdecee4522fdd202a51eca8c1e3669342 Mon Sep 17 00:00:00 2001 From: KornevNikita Date: Wed, 6 Mar 2024 15:45:57 -0800 Subject: [PATCH] Just use a normal runner --- .github/workflows/sycl-linux-run-tests.yml | 8 +------- .github/workflows/sycl-nightly.yml | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index c64e543dcd77f..1db9951bcf0c4 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -26,9 +26,6 @@ on: if inputs.target_devices contains 'ext_oneapi_hip' type: string required: False - ninja_build_cts_extra_args: - type: string - required: False tests_selector: description: | Two possible options: "e2e" and "cts". @@ -107,8 +104,6 @@ on: - 'opencl:fpga' - 'ext_oneapi_level_zero:gpu' - 'ext_oneapi_hip:gpu' - ninja_build_cts_extra_args: - type: string tests_selector: type: choice options: @@ -283,7 +278,6 @@ jobs: if: inputs.tests_selector == 'cts' env: CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }} - NINJA_BUILD_CTS_EXTRA_ARGS: ${{ inputs.ninja_build_cts_extra_args }} run: | cmake -GNinja -B./build-cts -S./khronos_sycl_cts -DCMAKE_CXX_COMPILER=$(which clang++) \ -DSYCL_IMPLEMENTATION=DPCPP \ @@ -292,7 +286,7 @@ jobs: -DSYCL_CTS_MEASURE_BUILD_TIMES=ON \ -DDPCPP_INSTALL_DIR="$$(dirname (which clang++))/.." \ $CMAKE_EXTRA_ARGS - ninja -C build-cts $NINJA_BUILD_CTS_EXTRA_ARGS + ninja -C build-cts - name: SYCL CTS List devices if: inputs.tests_selector == 'cts' diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml index 4d6cc3a7e286c..606577669489a 100644 --- a/.github/workflows/sycl-nightly.yml +++ b/.github/workflows/sycl-nightly.yml @@ -73,12 +73,11 @@ jobs: target_devices: ext_oneapi_cuda:gpu - name: SYCL-CTS - runner: '["cts-cpu"]' + runner: '["Linux", "gen12"]' image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN target_devices: opencl:cpu tests_selector: cts - ninja_build_cts_extra_args: '-j8' uses: ./.github/workflows/sycl-linux-run-tests.yml with: name: ${{ matrix.name }}