Skip to content

Missing path towards TBB DLLs on Windows #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2022
Merged

Missing path towards TBB DLLs on Windows #1195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions .github/workflows/conda-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:

env:
conda-pkgs: '/home/runner/conda_pkgs_dir/'
conda-bld: '/usr/share/miniconda3/envs/build/conda-bld/linux-64/'

steps:
- name: Checkout DPNP repo
Expand All @@ -52,6 +51,9 @@ jobs:
activate-environment: 'build'
use-only-tar-bz2: true

- name: Store conda paths as envs
run: echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/linux-64/" >> $GITHUB_ENV

- name: Install conda-build
run: conda install conda-build

Expand All @@ -76,7 +78,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: ${{ env.conda-bld }}${{ env.PACKAGE_NAME }}-*.tar.bz2
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2

build_windows:
runs-on: windows-latest
Expand All @@ -91,7 +93,6 @@ jobs:

env:
conda-pkgs: 'C:\Users\runneradmin\conda_pkgs_dir\'
conda-bld: 'C:\Miniconda3\envs\build\conda-bld\win-64\'

steps:
- name: Checkout DPNP repo
Expand All @@ -115,6 +116,11 @@ jobs:
activate-environment: 'build'
use-only-tar-bz2: true

- name: Store conda paths as envs
run: |
@echo on
(echo CONDA_BLD=%CONDA_PREFIX%\conda-bld\win-64\) >> %GITHUB_ENV%

- name: Cache conda packages
uses: actions/cache@v3
env:
Expand All @@ -139,7 +145,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
path: ${{ env.conda-bld }}${{ env.PACKAGE_NAME }}-*.tar.bz2
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2

test_linux:
needs: build_linux
Expand Down Expand Up @@ -201,7 +207,9 @@ jobs:
- name: Collect dependencies
run: |
export PACKAGE_VERSION=$(python -c "${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}")

echo PACKAGE_VERSION=${PACKAGE_VERSION}
echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV

conda install ${{ env.PACKAGE_NAME }}=${PACKAGE_VERSION} python=${{ matrix.python }} ${{ env.TEST_CHANNELS }} --only-deps --dry-run > lockfile
cat lockfile
Expand All @@ -221,11 +229,7 @@ jobs:
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-

- name: Install dpnp
run: |
export PACKAGE_VERSION=$(python -c "${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}")
echo PACKAGE_VERSION=${PACKAGE_VERSION}

conda install ${{ env.PACKAGE_NAME }}=${PACKAGE_VERSION} dpctl=${{ matrix.dpctl }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} dpctl=${{ matrix.dpctl }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
env:
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'

Expand Down Expand Up @@ -267,8 +271,6 @@ jobs:
tests-path: '${{ github.workspace }}\pkg\info\test\'
ver-json-path: '${{ github.workspace }}\version.json'
active-env-name: 'test'
miniconda-lib-path: 'C:\Miniconda3\envs\test\Library\lib\'
miniconda-bin-path: 'C:\Miniconda3\envs\test\Library\bin\'

steps:
- name: Download artifact
Expand Down Expand Up @@ -299,6 +301,12 @@ jobs:
miniconda-version: 'latest'
activate-environment: ${{ env.active-env-name }}

- name: Store conda paths as envs
run: |
@echo on
(echo CONDA_LIB_PATH=%CONDA_PREFIX%\Library\lib\) >> %GITHUB_ENV%
(echo CONDA_LIB_BIN_PATH=%CONDA_PREFIX%\Library\bin\) >> %GITHUB_ENV%

# Needed to be able to run conda index
- name: Install conda-build
run: conda install conda-build
Expand All @@ -322,6 +330,7 @@ jobs:
SET PACKAGE_VERSION=%%F
)
echo PACKAGE_VERSION: %PACKAGE_VERSION%
(echo PACKAGE_VERSION=%PACKAGE_VERSION%) >> %GITHUB_ENV%

conda install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% dpctl=${{ matrix.dpctl }} python=${{ matrix.python }} ${{ env.TEST_CHANNELS }} --only-deps --dry-run > lockfile
env:
Expand All @@ -348,13 +357,7 @@ jobs:
- name: Install dpnp
run: |
@echo on
set "SCRIPT=${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}"
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
SET PACKAGE_VERSION=%%F
)
echo PACKAGE_VERSION: %PACKAGE_VERSION%

conda install ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% dpctl=${{ matrix.dpctl }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} dpctl=${{ matrix.dpctl }} pytest python=${{ matrix.python }} ${{ env.TEST_CHANNELS }}
env:
TEST_CHANNELS: '-c ${{ env.channel-path }} ${{ env.CHANNELS }}'

Expand All @@ -365,10 +368,10 @@ jobs:
shell: pwsh
run: |
# Make sure the below libraries exist
Get-Item -Path ${{ env.miniconda-bin-path }}\OpenCL.dll
Get-Item -Path ${{ env.miniconda-lib-path }}\intelocl64.dll
Get-Item -Path "$env:CONDA_LIB_BIN_PATH\OpenCL.dll"
Get-Item -Path "$env:CONDA_LIB_PATH\intelocl64.dll"

echo "OCL_ICD_FILENAMES=${{ env.miniconda-lib-path }}\intelocl64.dll" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "OCL_ICD_FILENAMES = $env:CONDA_LIB_PATH\intelocl64.dll" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
try {$list = Get-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors | Select-Object -ExpandProperty Property } catch {$list=@()}

if ($list.count -eq 0) {
Expand All @@ -384,13 +387,13 @@ jobs:
New-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors
}

New-ItemProperty -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors -Name ${{ env.miniconda-lib-path }}\intelocl64.dll -Value 0
New-ItemProperty -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors -Name "$env:CONDA_LIB_PATH\intelocl64.dll" -Value 0
try {$list = Get-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors | Select-Object -ExpandProperty Property } catch {$list=@()}
Write-Output $(Get-Item -Path HKLM:\SOFTWARE\Khronos\OpenCL\Vendors)

# Now copy OpenCL.dll into system folder
$system_ocl_icd_loader="C:\Windows\System32\OpenCL.dll"
$python_ocl_icd_loader="${{ env.miniconda-bin-path }}\OpenCL.dll"
$python_ocl_icd_loader="$env:CONDA_LIB_BIN_PATH\OpenCL.dll"
Copy-Item -Path $python_ocl_icd_loader -Destination $system_ocl_icd_loader

if (Test-Path -Path $system_ocl_icd_loader) {
Expand All @@ -401,8 +404,11 @@ jobs:
Write-Output "OCL-ICD-Loader was not copied"
}

# Variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
echo "TBB_DLL_PATH=${{ env.miniconda-bin-path }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
# Configuration variable assisting OpenCL CPU driver to find TBB DLLs which are not located where it expects them by default
$cl_cfg="$env:CONDA_LIB_PATH\cl.cfg"
Write-Output "`n>>> Dump content of $cl_cfg`n" (Get-Content $cl_cfg) "`n<<< end of dump`n"
(Get-Content $cl_cfg) -replace '^CL_CONFIG_TBB_DLL_PATH =.*', "CL_CONFIG_TBB_DLL_PATH = $env:CONDA_LIB_BIN_PATH" | Set-Content $cl_cfg
Write-Output "`n>>> Dump content of modified $cl_cfg`n" (Get-Content $cl_cfg) "`n<<< end of dump`n"
}

- name: Smoke test
Expand Down