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
ec9c88d3
"vscode:/vscode.git/clone" did not exist on "ebfe47e46fa86a5b41be96c326a92f62ed6721da"
Commit
ec9c88d3
authored
Nov 07, 2021
by
yan.yan
Browse files
remove windows cuda 11.3 support, fix build problem
parent
ab445379
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
82 deletions
+3
-82
.github/workflows/build.yaml
.github/workflows/build.yaml
+1
-1
spconv/csrc/sparse/all.py
spconv/csrc/sparse/all.py
+2
-81
No files found.
.github/workflows/build.yaml
View file @
ec9c88d3
...
@@ -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.3'
,
'
11.4'
]
cuda-version
:
[
'
10.2'
,
'
11.1'
,
'
11.4'
]
steps
:
steps
:
-
uses
:
actions/checkout@master
-
uses
:
actions/checkout@master
-
uses
:
dorny/paths-filter@v2
-
uses
:
dorny/paths-filter@v2
...
...
spconv/csrc/sparse/all.py
View file @
ec9c88d3
...
@@ -98,12 +98,6 @@ class SpconvOps(pccm.Class):
...
@@ -98,12 +98,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
if
CUMM_CPU_ONLY_BUILD
:
return
code
.
make_invalid
()
return
code
.
make_invalid
()
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
code
.
raw
(
f
"""
code
.
raw
(
f
"""
int ndim = indices.dim(1) - 1;
int ndim = indices.dim(1) - 1;
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
...
@@ -144,13 +138,6 @@ class SpconvOps(pccm.Class):
...
@@ -144,13 +138,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
if
CUMM_CPU_ONLY_BUILD
:
return
code
.
make_invalid
()
return
code
.
make_invalid
()
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"int"
)
for
ndim
in
self
.
ndims
:
for
ndim
in
self
.
ndims
:
code
.
raw
(
f
"""
code
.
raw
(
f
"""
if (ndim ==
{
ndim
}
){{
if (ndim ==
{
ndim
}
){{
...
@@ -175,12 +162,6 @@ class SpconvOps(pccm.Class):
...
@@ -175,12 +162,6 @@ class SpconvOps(pccm.Class):
if
CUMM_CPU_ONLY_BUILD
:
if
CUMM_CPU_ONLY_BUILD
:
return
code
.
make_invalid
()
return
code
.
make_invalid
()
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"int"
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
int ndim = indices.dim(1) - 1;
int ndim = indices.dim(1) - 1;
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
...
@@ -226,11 +207,6 @@ class SpconvOps(pccm.Class):
...
@@ -226,11 +207,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"transposed"
,
f
"bool"
,
"false"
)
code
.
arg
(
"transposed"
,
f
"bool"
,
"false"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
code
.
raw
(
f
"""
code
.
raw
(
f
"""
int ndim = indices.dim(1) - 1;
int ndim = indices.dim(1) - 1;
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
...
@@ -276,12 +252,6 @@ class SpconvOps(pccm.Class):
...
@@ -276,12 +252,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"ksize, stride, padding, dilation"
,
f
"std::vector<int>"
)
code
.
arg
(
"ksize, stride, padding, dilation"
,
f
"std::vector<int>"
)
code
.
arg
(
"transposed"
,
f
"bool"
,
"false"
)
code
.
arg
(
"transposed"
,
f
"bool"
,
"false"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"int"
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
int ndim = indices.dim(1) - 1;
int ndim = indices.dim(1) - 1;
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
TV_ASSERT_RT_ERR(output_dims.size() == ndim && input_dims.size() == ndim &&
...
@@ -326,12 +296,6 @@ class SpconvOps(pccm.Class):
...
@@ -326,12 +296,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"indice_pair_mask"
,
"tv::Tensor"
,
"tv::Tensor()"
,
"cumm.tensorview.Tensor = Tensor()"
)
code
.
arg
(
"indice_pair_mask"
,
"tv::Tensor"
,
"tv::Tensor()"
,
"cumm.tensorview.Tensor = Tensor()"
)
code
.
arg
(
"backward"
,
"bool"
,
"false"
)
code
.
arg
(
"backward"
,
"bool"
,
"false"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int = 0"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
,
pyanno
=
"int = 0"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"int"
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
int ndim = indices.dim(1) - 1;
int ndim = indices.dim(1) - 1;
TV_ASSERT_RT_ERR(input_dims.size() == ndim &&
TV_ASSERT_RT_ERR(input_dims.size() == ndim &&
...
@@ -442,12 +406,6 @@ class SpconvOps(pccm.Class):
...
@@ -442,12 +406,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"out_inds"
,
"tv::Tensor"
)
code
.
arg
(
"out_inds"
,
"tv::Tensor"
)
code
.
arg
(
"in_inds"
,
"tv::Tensor"
)
code
.
arg
(
"in_inds"
,
"tv::Tensor"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
code
.
add_dependency
(
IndiceMaxPool
)
code
.
add_dependency
(
IndiceMaxPool
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
return IndiceMaxPool::forward(out, inp, out_inds, in_inds, stream);
return IndiceMaxPool::forward(out, inp, out_inds, in_inds, stream);
...
@@ -467,12 +425,6 @@ class SpconvOps(pccm.Class):
...
@@ -467,12 +425,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"out_inds"
,
"tv::Tensor"
)
code
.
arg
(
"out_inds"
,
"tv::Tensor"
)
code
.
arg
(
"in_inds"
,
"tv::Tensor"
)
code
.
arg
(
"in_inds"
,
"tv::Tensor"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
code
.
add_dependency
(
IndiceMaxPool
)
code
.
add_dependency
(
IndiceMaxPool
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
return IndiceMaxPool::backward(out, inp, dout, dinp, out_inds, in_inds, stream);
return IndiceMaxPool::backward(out, inp, dout, dinp, out_inds, in_inds, stream);
...
@@ -489,12 +441,6 @@ class SpconvOps(pccm.Class):
...
@@ -489,12 +441,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"inp"
,
"tv::Tensor"
)
code
.
arg
(
"inp"
,
"tv::Tensor"
)
code
.
arg
(
"inds"
,
"tv::Tensor"
)
code
.
arg
(
"inds"
,
"tv::Tensor"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
code
.
add_dependency
(
IndiceMaxPool
)
code
.
add_dependency
(
IndiceMaxPool
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
return IndiceMaxPool::forward_implicit_gemm(out, inp, inds, stream);
return IndiceMaxPool::forward_implicit_gemm(out, inp, inds, stream);
...
@@ -513,12 +459,6 @@ class SpconvOps(pccm.Class):
...
@@ -513,12 +459,6 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"dinp"
,
"tv::Tensor"
)
code
.
arg
(
"dinp"
,
"tv::Tensor"
)
code
.
arg
(
"inds"
,
"tv::Tensor"
)
code
.
arg
(
"inds"
,
"tv::Tensor"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
code
.
arg
(
"stream"
,
"std::uintptr_t"
,
"0"
,
pyanno
=
"int"
)
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
code
.
add_dependency
(
IndiceMaxPool
)
code
.
add_dependency
(
IndiceMaxPool
)
code
.
raw
(
f
"""
code
.
raw
(
f
"""
return IndiceMaxPool::backward_implicit_gemm(out, inp, dout, dinp, inds, stream);
return IndiceMaxPool::backward_implicit_gemm(out, inp, dout, dinp, inds, stream);
...
@@ -603,12 +543,6 @@ class SpconvOps(pccm.Class):
...
@@ -603,12 +543,6 @@ class SpconvOps(pccm.Class):
}}
}}
"""
"""
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"tv::Tensor"
)
code
.
add_dependency
(
ThrustLib
,
TensorViewKernel
)
code
.
add_dependency
(
ThrustLib
,
TensorViewKernel
)
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
raw
(
f
"""
code
.
raw
(
f
"""
...
@@ -654,11 +588,6 @@ class SpconvOps(pccm.Class):
...
@@ -654,11 +588,6 @@ class SpconvOps(pccm.Class):
}}
}}
}}
}}
"""
"""
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"tv::Tensor"
)
code
.
add_dependency
(
ThrustLib
,
TensorViewKernel
)
code
.
add_dependency
(
ThrustLib
,
TensorViewKernel
)
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
raw
(
f
"""
code
.
raw
(
f
"""
...
@@ -710,11 +639,6 @@ class SpconvOps(pccm.Class):
...
@@ -710,11 +639,6 @@ class SpconvOps(pccm.Class):
}}
}}
}}
}}
"""
"""
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"tv::Tensor"
)
code
.
add_dependency
(
CustomThrustLib
,
TensorViewKernel
)
code
.
add_dependency
(
CustomThrustLib
,
TensorViewKernel
)
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
raw
(
f
"""
code
.
raw
(
f
"""
...
@@ -770,11 +694,6 @@ class SpconvOps(pccm.Class):
...
@@ -770,11 +694,6 @@ class SpconvOps(pccm.Class):
}}
}}
}}
}}
"""
"""
if
CUMM_CPU_ONLY_BUILD
:
code
.
raw
(
f
"""
TV_THROW_RT_ERR("CPU ONLY build, don't support cuda algorithm.");
"""
)
return
code
.
ret
(
"tv::Tensor"
)
code
.
add_dependency
(
CustomThrustLib
,
TensorViewKernel
)
code
.
add_dependency
(
CustomThrustLib
,
TensorViewKernel
)
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
add_param_class
(
"cudakers"
,
CudaCommonKernel
())
code
.
raw
(
f
"""
code
.
raw
(
f
"""
...
@@ -964,6 +883,8 @@ class SpconvOps(pccm.Class):
...
@@ -964,6 +883,8 @@ class SpconvOps(pccm.Class):
code
.
arg
(
"empty_mean"
,
"bool"
,
"false"
)
code
.
arg
(
"empty_mean"
,
"bool"
,
"false"
)
code
.
arg
(
"clear_voxels"
,
"bool"
,
"true"
)
code
.
arg
(
"clear_voxels"
,
"bool"
,
"true"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
)
code
.
arg
(
"stream_int"
,
f
"std::uintptr_t"
,
"0"
)
if
CUMM_CPU_ONLY_BUILD
:
return
code
.
make_invalid
()
code
.
raw
(
f
"""
code
.
raw
(
f
"""
int ndim = vsize.size();
int ndim = vsize.size();
...
...
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