Commit 3c1f4198 authored by Yan Yan's avatar Yan Yan
Browse files

finally, we find the windows CUDA bug

parent 2b511849
...@@ -12,7 +12,7 @@ on: ...@@ -12,7 +12,7 @@ on:
jobs: jobs:
build-windows: build-windows:
runs-on: windows-latest runs-on: windows-2019
strategy: strategy:
matrix: matrix:
python-version: ['3.7', '3.8', '3.9', '3.10'] python-version: ['3.7', '3.8', '3.9', '3.10']
...@@ -48,16 +48,7 @@ jobs: ...@@ -48,16 +48,7 @@ jobs:
$Env:CUMM_CUDA_ARCH_LIST = "all" $Env:CUMM_CUDA_ARCH_LIST = "all"
$Env:SPCONV_DISABLE_JIT = "1" $Env:SPCONV_DISABLE_JIT = "1"
pip install pccm pybind11 pip install pccm pybind11
$CUDA_INCLUDE_THRUST = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ matrix.cuda-version }}\include\thrust"
if (Test-Path -Path $CUDA_INCLUDE_THRUST) {
} else {
git clone -b cuda-${{ matrix.cuda-version }} https://github.com/NVIDIA/thrust $HOME/thrust_git
ls $HOME/thrust_git/thrust
mv $HOME/thrust_git/thrust "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ matrix.cuda-version }}\include"
}
ls "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ matrix.cuda-version }}\include\thrust" ls "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${{ matrix.cuda-version }}\include\thrust"
$Env:CUMM_THRUST_INCLUDE = "$HOME/thrust_git"
python -m build --wheel --outdir dist/ . python -m build --wheel --outdir dist/ .
shell: powershell shell: powershell
......
...@@ -10,17 +10,38 @@ $CUDA_KNOWN_URLS = @{ ...@@ -10,17 +10,38 @@ $CUDA_KNOWN_URLS = @{
"11.2" = "https://developer.download.nvidia.com/compute/cuda/11.2.2/network_installers/cuda_11.2.2_win10_network.exe"; "11.2" = "https://developer.download.nvidia.com/compute/cuda/11.2.2/network_installers/cuda_11.2.2_win10_network.exe";
"11.3" = "https://developer.download.nvidia.com/compute/cuda/11.3.1/network_installers/cuda_11.3.1_win10_network.exe"; "11.3" = "https://developer.download.nvidia.com/compute/cuda/11.3.1/network_installers/cuda_11.3.1_win10_network.exe";
"11.4" = "https://developer.download.nvidia.com/compute/cuda/11.4.2/network_installers/cuda_11.4.2_win10_network.exe"; "11.4" = "https://developer.download.nvidia.com/compute/cuda/11.4.2/network_installers/cuda_11.4.2_win10_network.exe";
"11.5" = "https://developer.download.nvidia.com/compute/cuda/11.5.0/network_installers/cuda_11.5.0_win10_network.exe";
} }
# cuda_runtime.h is in nvcc <= 10.2, but cudart >= 11.0 # cuda_runtime.h is in nvcc <= 10.2, but cudart >= 11.0
# @todo - make this easier to vary per CUDA version. # @todo - make this easier to vary per CUDA version.
$CUDA_PACKAGES_IN = @(
if (($CUDA_VERSION_FULL -eq "10.2") -or ($CUDA_VERSION_FULL -eq "11.0") -or ($CUDA_VERSION_FULL -eq "11.1") -or ($CUDA_VERSION_FULL -eq "11.2")){
$CUDA_PACKAGES_IN = @(
"cuda_nvcc";
"visual_studio_integration";
"nvrtc_dev";
"cudart";
# before 11.3, thrust are included by default and no explicit package exists
)
} elseif ($CUDA_VERSION_FULL -eq "11.3"){
$CUDA_PACKAGES_IN = @(
"nvcc";
"visual_studio_integration";
"cuda_nvrtc";
"cuda_cudart";
"cuda_thrust";
)
} else {
# after cuda 11.4
$CUDA_PACKAGES_IN = @(
"nvcc"; "nvcc";
"visual_studio_integration"; "visual_studio_integration";
"curand_dev";
"nvrtc_dev"; "nvrtc_dev";
"cudart"; "cudart";
) "thrust";
)
}
## ------------------- ## -------------------
...@@ -40,6 +61,7 @@ if(-not $cuda_ver_matched){ ...@@ -40,6 +61,7 @@ if(-not $cuda_ver_matched){
$CUDA_MAJOR=$Matches.major $CUDA_MAJOR=$Matches.major
$CUDA_MINOR=$Matches.minor $CUDA_MINOR=$Matches.minor
## ------------------------------------------------ ## ------------------------------------------------
## Select CUDA packages to install from environment ## Select CUDA packages to install from environment
## ------------------------------------------------ ## ------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment