Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
one
spconv
Commits
1f989ba0
Commit
1f989ba0
authored
Nov 07, 2021
by
yan.yan
Browse files
fix windows cuda 11.3 problem
parent
ec9c88d3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
.github/workflows/build.yaml
.github/workflows/build.yaml
+1
-1
pyproject.toml
pyproject.toml
+1
-1
spconv/csrc/sparse/all.py
spconv/csrc/sparse/all.py
+2
-1
tools/install_windows_cuda.ps1
tools/install_windows_cuda.ps1
+1
-1
No files found.
.github/workflows/build.yaml
View file @
1f989ba0
...
@@ -16,7 +16,7 @@ jobs:
...
@@ -16,7 +16,7 @@ jobs:
strategy
:
strategy
:
matrix
:
matrix
:
python-version
:
[
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
python-version
:
[
'
3.7'
,
'
3.8'
,
'
3.9'
,
'
3.10'
]
cuda-version
:
[
'
10.2'
,
'
11.1'
,
'
11.4'
]
cuda-version
:
[
'
10.2'
,
'
11.1'
,
'
11.3'
,
'
11.4'
]
steps
:
steps
:
-
uses
:
actions/checkout@master
-
uses
:
actions/checkout@master
-
uses
:
dorny/paths-filter@v2
-
uses
:
dorny/paths-filter@v2
...
...
pyproject.toml
View file @
1f989ba0
[build-system]
[build-system]
requires
=
[
"setuptools>=41.0"
,
"wheel"
,
"pccm>=0.2.1
9
"
,
"cumm>=0.2.
0
"
]
requires
=
[
"setuptools>=41.0"
,
"wheel"
,
"pccm>=0.2.
2
1"
,
"cumm>=0.2.
1
"
]
build-backend
=
"setuptools.build_meta"
build-backend
=
"setuptools.build_meta"
spconv/csrc/sparse/all.py
View file @
1f989ba0
...
@@ -29,7 +29,8 @@ class CustomThrustLib(pccm.Class):
...
@@ -29,7 +29,8 @@ class CustomThrustLib(pccm.Class):
super
().
__init__
()
super
().
__init__
()
self
.
add_dependency
(
ThrustLib
)
self
.
add_dependency
(
ThrustLib
)
# https://github.com/NVIDIA/thrust/issues/1401#issuecomment-806403746
# https://github.com/NVIDIA/thrust/issues/1401#issuecomment-806403746
self
.
build_meta
.
add_cflags
(
"nvcc"
,
"-Xcompiler"
,
"-fno-gnu-unique"
)
if
compat
.
InLinux
:
self
.
build_meta
.
add_cflags
(
"nvcc"
,
"-Xcompiler"
,
"-fno-gnu-unique"
)
class
ThrustCustomAllocatorV2
(
pccm
.
Class
,
pccm
.
pybind
.
PybindClassMixin
):
class
ThrustCustomAllocatorV2
(
pccm
.
Class
,
pccm
.
pybind
.
PybindClassMixin
):
def
__init__
(
self
):
def
__init__
(
self
):
...
...
tools/install_windows_cuda.ps1
View file @
1f989ba0
...
@@ -28,7 +28,7 @@ if (($CUDA_VERSION_FULL -eq "10.2") -or ($CUDA_VERSION_FULL -eq "11.0") -or ($CU
...
@@ -28,7 +28,7 @@ if (($CUDA_VERSION_FULL -eq "10.2") -or ($CUDA_VERSION_FULL -eq "11.0") -or ($CU
)
)
}
elseif
(
$CUDA_VERSION_FULL
-eq
"11.3"
){
}
elseif
(
$CUDA_VERSION_FULL
-eq
"11.3"
){
$CUDA_PACKAGES_IN
=
@(
$CUDA_PACKAGES_IN
=
@(
"nvcc"
;
"
cuda_
nvcc"
;
"visual_studio_integration"
;
"visual_studio_integration"
;
"cuda_nvrtc"
;
"cuda_nvrtc"
;
"cuda_cudart"
;
"cuda_cudart"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment