Merge branch 'master' into all-int-gpu

antonwolfy · web-flow · commit 146622d635e9 · 2025-04-30T14:52:40.000+02:00
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -376,7 +376,7 @@ jobs:
             Write-Warning "File $script_path was NOT found!"
           }
           # Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
-          $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
+          $cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"
           Get-Content -Tail 5 -Path $cl_cfg
 
       - name: Smoke test
diff --git a/.github/workflows/cron-run-tests.yaml b/.github/workflows/cron-run-tests.yaml
@@ -108,7 +108,7 @@ jobs:
             Write-Warning "File $script_path was NOT found!"
           }
           # Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
-          $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"
+          $cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"
           Get-Content -Tail 5 -Path $cl_cfg
 
       - name: Smoke test

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ jobs:`
`376`	`376`	`Write-Warning "File $script_path was NOT found!"`
`377`	`377`	`}`
`378`	`378`	`# Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default`
`379`		`- $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"`
	`379`	`+ $cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"`
`380`	`380`	`Get-Content -Tail 5 -Path $cl_cfg`
`381`	`381`
`382`	`382`	`- name: Smoke test`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ jobs:`
`108`	`108`	`Write-Warning "File $script_path was NOT found!"`
`109`	`109`	`}`
`110`	`110`	`# Check the variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default`
`111`		`- $cl_cfg="$env:CONDA_PREFIX\Library\lib\cl.cfg"`
	`111`	`+ $cl_cfg="$env:CONDA_PREFIX\Library\bin\cl.cfg"`
`112`	`112`	`Get-Content -Tail 5 -Path $cl_cfg`
`113`	`113`
`114`	`114`	`- name: Smoke test`