Skip to content

Commit 37516e5

Browse files
Merge pull request #1159 from IntelPython/fix-ocl-activation-windows
Adjusting test_windows step to work with intel-opencl-rt=2023.1.0
2 parents cde3269 + 0bf287e commit 37516e5

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

.github/workflows/conda-package.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -269,22 +269,10 @@ jobs:
269269
- name: Configure Intel OpenCL CPU RT
270270
shell: pwsh
271271
run: |
272-
if (-not (Test-Path -Path HKLM:\SOFTWARE\Khronos)) {
273-
New-Item -Path HKLM:\SOFTWARE\Khronos
274-
}
275-
if (-not (Test-Path -Path HKLM:\SOFTWARE\Khronos\OpenCL)) {
276-
New-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL
277-
}
278-
if (-not (Test-Path -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors)) {
279-
New-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors
280-
}
281-
$conda_env_library = "$env:CONDA_PREFIX\Library"
282-
New-ItemProperty -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors -Name $conda_env_library\lib\intelocl64.dll -Value 0
283-
Write-Host $(Get-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors)
284-
# Variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
285-
$cl_cfg="$conda_env_library\lib\cl.cfg"
286-
Write-Output $cl_cfg
287-
(Get-Content $cl_cfg) -replace '^CL_CONFIG_TBB_DLL_PATH =', "CL_CONFIG_TBB_DLL_PATH = $conda_env_library\bin" | Set-Content $cl_cfg
272+
$script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
273+
&$script_path
274+
# Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
275+
$cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
288276
Get-Content -Tail 5 -Path $cl_cfg
289277
- name: Smoke test, step 1
290278
shell: cmd /C CALL {0}

0 commit comments

Comments
 (0)