Skip to content

Commit db114b2

Browse files
committed
remove step installing intel-opencl-rt
1 parent 1f34b63 commit db114b2

1 file changed

Lines changed: 16 additions & 20 deletions

File tree

.github/workflows/run-tests-from-dppy-bits.yaml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -146,28 +146,20 @@ jobs:
146146
IF "%PYTHON_SPEC%"=="" SET "PYTHON_SPEC=${{ matrix.python }}"
147147
conda install -n ${{ env.TEST_ENV_NAME }} -c dppy/label/dev ${{ env.CHANNELS }} dpctl pytest cython setuptools c-compiler cxx-compiler python="%PYTHON_SPEC%"
148148
149-
# intel-opencl-rt is not being installed when running conda install dpctl, so do it manually
150-
- name: Install intel-opencl-rt
151-
run: |
152-
conda install -n ${{ env.TEST_ENV_NAME }} -c dppy/label/dev ${{ env.CHANNELS }} intel-opencl-rt
153-
154-
- name: Configure Intel OpenCL CPU RT
155-
shell: pwsh
149+
- name: Report content of test environment
150+
shell: cmd /C CALL {0}
156151
run: |
157-
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
158-
if (Test-Path $script_path) {
159-
&$script_path
160-
} else {
161-
Write-Warning "File $script_path was NOT found!"
162-
}
163-
# Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
164-
$cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"
165-
Get-Content -Tail 5 -Path $cl_cfg
152+
conda info && conda list -n ${{ env.TEST_ENV_NAME }}
166153
167154
- name: Smoke test
168155
shell: cmd /C CALL {0}
169-
run: >-
170-
conda activate ${{ env.TEST_ENV_NAME }} && python -m dpctl -f
156+
run: |
157+
call conda activate ${{ env.TEST_ENV_NAME }}
158+
set "OCL_ICD_FILENAMES="
159+
call "%CONDA_PREFIX%\etc\conda\activate.d\khronos-opencl-icd-loader_activate.bat"
160+
echo OCL_ICD_FILENAMES=%OCL_ICD_FILENAMES%
161+
python -m dpctl -f
162+
python -c "import dpctl; assert dpctl.has_cpu_devices(), 'no SYCL CPU device found'"
171163
172164
- name: Create empty temporary directory to run tests from
173165
shell: cmd /C CALL {0}
@@ -181,5 +173,9 @@ jobs:
181173
env:
182174
SYCL_CACHE_PERSISTENT: 1
183175
working-directory: ${{ env.workdir }}\test_tmp
184-
run: >-
185-
conda activate ${{ env.TEST_ENV_NAME }} && python -m pytest -v -s --pyargs ${{ env.MODULE_NAME }}
176+
run: |
177+
call conda activate ${{ env.TEST_ENV_NAME }}
178+
set "OCL_ICD_FILENAMES="
179+
call "%CONDA_PREFIX%\etc\conda\activate.d\khronos-opencl-icd-loader_activate.bat"
180+
echo OCL_ICD_FILENAMES=%OCL_ICD_FILENAMES%
181+
python -m pytest -v -s --pyargs ${{ env.MODULE_NAME }}

0 commit comments

Comments
 (0)