test commit

Author: ndgrigorian

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

@@ -151,13 +151,44 @@ jobs:
         run: |
           conda info && conda list -n ${{ env.TEST_ENV_NAME }}
 
+      # The OpenCL ICD loader finds the CPU driver either through OCL_ICD_FILENAMES,
+      # which a conda activation script sets, or through the registry. Under the
+      # elevated privileges that GitHub Actions runners have, only the registry is
+      # consulted. How the key gets written depends on which build of
+      # intel-opencl-rt the solver picks, and it picks both across this matrix: the
+      # Intel channel build ships a script that writes it, while the conda-forge
+      # repack of the same name instead installs ICD vendor files and leaves
+      # discovery to khronos-opencl-icd-loader, so those have to be registered here.
+      - name: Register the OpenCL CPU driver with the ICD loader
+        shell: pwsh
+        run: |
+          $vendors = "HKLM:\SOFTWARE\Khronos\OpenCL\Vendors"
+          $script = "$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
+          $icds = @(Get-ChildItem -ErrorAction SilentlyContinue -Path "$env:CONDA_PREFIX\Library\etc\OpenCL\vendors\*.icd")
+          if (Test-Path $script) {
+            Write-Host "running $script"
+            & $script
+          } elseif ($icds.Count -gt 0) {
+            if (-not (Test-Path $vendors)) { New-Item -Path $vendors -Force | Out-Null }
+            foreach ($icd in $icds) {
+              # conda substitutes the environment prefix into these text files with
+              # forward slashes, which LoadLibrary does not accept as a separator
+              $dll = (Get-Content -Path $icd.FullName -TotalCount 1).Trim().Replace("/", "\")
+              if (-not (Test-Path $dll)) { throw "driver $dll named by $($icd.Name) does not exist" }
+              Write-Host "registering $dll"
+              New-ItemProperty -Path $vendors -Name $dll -Value 0 -PropertyType DWord -Force | Out-Null
+            }
+          } else {
+            throw "intel-opencl-rt provided neither $script nor any ICD vendor file"
+          }
+          Get-ItemProperty -Path $vendors
+
       - name: Smoke test
         shell: cmd /C CALL {0}
+        env:
+          SYCL_UR_TRACE: 1
         run: |
           call conda activate ${{ env.TEST_ENV_NAME }}
-          set "OCL_ICD_FILENAMES="
-          call "%CONDA_PREFIX%\etc\conda\activate.d\khronos-opencl-icd-loader_activate.bat"
-          echo OCL_ICD_FILENAMES=%OCL_ICD_FILENAMES%
           python -m dpctl -f
           python -c "import dpctl; assert dpctl.has_cpu_devices(), 'no SYCL CPU device found'"
 
@@ -175,7 +206,4 @@ jobs:
         working-directory: ${{ env.workdir }}\test_tmp
         run: |
           call conda activate ${{ env.TEST_ENV_NAME }}
-          set "OCL_ICD_FILENAMES="
-          call "%CONDA_PREFIX%\etc\conda\activate.d\khronos-opencl-icd-loader_activate.bat"
-          echo OCL_ICD_FILENAMES=%OCL_ICD_FILENAMES%
           python -m pytest -v -s --pyargs ${{ env.MODULE_NAME }}