From c80490a95e935c783686401287301a550cc2f5f2 Mon Sep 17 00:00:00 2001 From: chenxl Date: Thu, 29 Aug 2024 16:03:59 +0000 Subject: [PATCH] [fix] some bugs while package in github action --- .github/workflows/package_wheel_release.yml | 9 +++++---- .github/workflows/package_wheel_test.yml | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/package_wheel_release.yml b/.github/workflows/package_wheel_release.yml index f04ee07..8028d59 100644 --- a/.github/workflows/package_wheel_release.yml +++ b/.github/workflows/package_wheel_release.yml @@ -28,7 +28,6 @@ jobs: - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.1.1', torch: '2.4.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'FANCY', torch_cu: '121'} - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.1.1', torch: '2.4.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'AVX512', torch_cu: '121'} - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.1.1', torch: '2.4.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'AVX2', torch_cu: '121'} - - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.5.1', torch: '2.3.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'FANCY', torch_cu: '124'} - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.2.2', torch: '2.3.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'FANCY', torch_cu: '121'} - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.2.2', torch: '2.3.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'AVX512', torch_cu: '121'} - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.2.2', torch: '2.3.0', cudaarch: '8.0;8.6;8.7;8.9;9.0+PTX', instruct: 'AVX2', torch_cu: '121'} @@ -187,8 +186,10 @@ jobs: } } if ($IsWindows) { - $env:CUDA_PATH = "$env:CUDA_PATH/Library" - $env:CUDA_HOME = $env:CUDA_PATH + if (Test-Path -Path "$env:CUDA_PATH/Library/bin/nvcc.exe"){ + $env:CUDA_PATH = "$env:CUDA_PATH/Library" + $env:CUDA_HOME = $env:CUDA_PATH + } $env:PATH = "$env:CUDA_PATH/bin;" + $env:PATH $directory = "$env:CUDA_PATH/lib/x64/" if (-not (Test-Path -Path $directory)) { @@ -197,7 +198,7 @@ jobs: } cp $env:CUDA_PATH/lib/*.lib $env:CUDA_PATH/lib/x64/ $env:INCLUDE =$env:CUDA_PATH + "/include/targets/x64;" + $env:INCLUDE - + $env:INCLUDE =$env:CONDA_PREFIX + "/include;" + $env:INCLUDE } python -m pip install torch==${{ matrix.torch }} torchvision torchaudio --index-url https://download.pytorch.org/whl/cu${{ matrix.torch_cu }} python -m pip install cpufeature build wheel ninja packaging setuptools diff --git a/.github/workflows/package_wheel_test.yml b/.github/workflows/package_wheel_test.yml index 9fe82f8..35636db 100644 --- a/.github/workflows/package_wheel_test.yml +++ b/.github/workflows/package_wheel_test.yml @@ -1,4 +1,4 @@ -name: Build Wheels +name: Build Wheels Tests on: workflow_dispatch: inputs: @@ -16,8 +16,10 @@ jobs: matrix: include: # Ubuntu + - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.5.1', torch: '2.4.0', cudaarch: '8.9;9.0+PTX', instruct: 'FANCY', torch_cu: '124'} - { os: ubuntu-20.04, pyver: '3.12', cuda: '12.2.2', torch: '2.3.0', cudaarch: '8.9;9.0+PTX', instruct: 'FANCY', torch_cu: '121'} - { os: windows-2022, pyver: '3.11', cuda: '12.5.1', torch: '2.4.0', cudaarch: '8.9;9.0+PTX', instruct: 'AVX2', torch_cu: '124'} + - { os: windows-2022, pyver: '3.12', cuda: '12.1.1', torch: '2.3.0', cudaarch: '8.9;9.0+PTX', instruct: 'AVX2', torch_cu: '121'} defaults: run: @@ -96,12 +98,19 @@ jobs: } } if ($IsWindows) { - $env:CUDA_PATH = "$env:CUDA_PATH/Library" - $env:CUDA_HOME = $env:CUDA_PATH + if (Test-Path -Path "$env:CUDA_PATH/Library/bin/nvcc.exe"){ + $env:CUDA_PATH = "$env:CUDA_PATH/Library" + $env:CUDA_HOME = $env:CUDA_PATH + } $env:PATH = "$env:CUDA_PATH/bin;" + $env:PATH + $directory = "$env:CUDA_PATH/lib/x64/" + if (-not (Test-Path -Path $directory)) { + New-Item -ItemType Directory -Path $directory + Write-Output "Directory '$directory' created." + } cp $env:CUDA_PATH/lib/*.lib $env:CUDA_PATH/lib/x64/ $env:INCLUDE =$env:CUDA_PATH + "/include/targets/x64;" + $env:INCLUDE - + $env:INCLUDE =$env:CONDA_PREFIX + "/include;" + $env:INCLUDE } python -m pip install torch==${{ matrix.torch }} torchvision torchaudio --index-url https://download.pytorch.org/whl/cu${{ matrix.torch_cu }} python -m pip install cpufeature build wheel ninja packaging setuptools