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
edf48feb
Commit
edf48feb
authored
Dec 10, 2024
by
yan.yan
Browse files
fix compile problem
parent
f0ffe617
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
.github/workflows/build.yaml
.github/workflows/build.yaml
+3
-2
pyproject.toml
pyproject.toml
+1
-1
setup.py
setup.py
+2
-2
No files found.
.github/workflows/build.yaml
View file @
edf48feb
...
@@ -153,7 +153,7 @@ jobs:
...
@@ -153,7 +153,7 @@ jobs:
CUDA_VERSION
:
${{ matrix.cuda-version }}
CUDA_VERSION
:
${{ matrix.cuda-version }}
PYTHON_VERSION
:
${{ matrix.python-version }}
PYTHON_VERSION
:
${{ matrix.python-version }}
DOCKER_IMAGE
:
scrin/manylinux2014-cuda:cu${{ matrix.cuda-version }}-devel-1.0.0
DOCKER_IMAGE
:
scrin/manylinux2014-cuda:cu${{ matrix.cuda-version }}-devel-1.0.0
PLAT
:
manylinux2014_x86_64
PLAT
:
${{ matrix.cuda-version > '123' && 'manylinux_2_28_x86_64' || '
manylinux2014_x86_64
' }}
BOOST_VERSION
:
boost_1_77_0
BOOST_VERSION
:
boost_1_77_0
if
:
|
if
:
|
(env.CUDA_VERSION != '') && (
(env.CUDA_VERSION != '') && (
...
@@ -174,7 +174,8 @@ jobs:
...
@@ -174,7 +174,8 @@ jobs:
env
:
env
:
CUDA_VERSION
:
${{ matrix.cuda-version }}
CUDA_VERSION
:
${{ matrix.cuda-version }}
PYTHON_VERSION
:
${{ matrix.python-version }}
PYTHON_VERSION
:
${{ matrix.python-version }}
DOCKER_IMAGE
:
scrin/manylinux2014-cuda:cu126-devel-1.0.0
# use cu121 docker to build cpu wheel, cuda 124+ manylinux requires manylinux_2_28
DOCKER_IMAGE
:
scrin/manylinux2014-cuda:cu121-devel-1.0.0
PLAT
:
manylinux2014_x86_64
PLAT
:
manylinux2014_x86_64
BOOST_VERSION
:
boost_1_77_0
BOOST_VERSION
:
boost_1_77_0
if
:
|
if
:
|
...
...
pyproject.toml
View file @
edf48feb
[build-system]
[build-system]
requires
=
[
"setuptools>=41.0"
,
"wheel"
,
"pccm>=0.4.16"
,
"cumm>=0.7.
5
"
]
requires
=
[
"setuptools>=41.0"
,
"wheel"
,
"pccm>=0.4.16"
,
"cumm>=0.7.
9
"
]
# requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.0", "cumm @ file:///io/dist/cumm_cu120-0.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"]
# requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.0", "cumm @ file:///io/dist/cumm_cu120-0.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"]
# requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.0", "cumm-cu126 @ file:///io/dist/cumm_cu126-0.7.3-cp313-cp313-manylinux_2_28_x86_64.whl"]
# requires = ["setuptools>=41.0", "wheel", "pccm>=0.4.0", "cumm-cu126 @ file:///io/dist/cumm_cu126-0.7.3-cp313-cp313-manylinux_2_28_x86_64.whl"]
build-backend
=
"setuptools.build_meta"
build-backend
=
"setuptools.build_meta"
setup.py
View file @
edf48feb
...
@@ -39,9 +39,9 @@ if cuda_ver:
...
@@ -39,9 +39,9 @@ if cuda_ver:
cuda_ver_str
=
cuda_ver
.
replace
(
"."
,
""
)
# 10.2 to 102
cuda_ver_str
=
cuda_ver
.
replace
(
"."
,
""
)
# 10.2 to 102
RELEASE_NAME
+=
"-cu{}"
.
format
(
cuda_ver_str
)
RELEASE_NAME
+=
"-cu{}"
.
format
(
cuda_ver_str
)
deps
=
[
"cumm-cu{}>=0.7.
5
, <0.8.0"
.
format
(
cuda_ver_str
)]
deps
=
[
"cumm-cu{}>=0.7.
9
, <0.8.0"
.
format
(
cuda_ver_str
)]
else
:
else
:
deps
=
[
"cumm>=0.7.
5
, <0.8.0"
]
deps
=
[
"cumm>=0.7.
9
, <0.8.0"
]
...
...
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