Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
MMCV
Commits
6299bc02
Unverified
Commit
6299bc02
authored
Sep 04, 2023
by
q.yao
Committed by
GitHub
Sep 04, 2023
Browse files
Support pre released pytorch2.1.0 (#2865)
parent
c8a9ae75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h
mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h
+3
-2
setup.py
setup.py
+11
-6
No files found.
mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h
View file @
6299bc02
...
...
@@ -319,8 +319,9 @@ struct ShapeBase : public SimpleVector<int, MaxDim> {
TV_HOST_DEVICE_INLINE
ShapeBase
(
std
::
initializer_list
<
int
>
shape
)
:
SimpleVector
<
int
,
MaxDim
>
(
shape
)
{}
template
<
typename
scalar_t
,
template
<
class
...
>
class
Container
>
ShapeBase
(
Container
<
scalar_t
>
shape
)
:
SimpleVector
<
int
,
MaxDim
>
(
shape
)
{}
// TODO: find out why this template can no be used on windows
// template <typename scalar_t, template <class...> class Container>
// ShapeBase(Container<scalar_t> shape) : SimpleVector<int, MaxDim>(shape) {}
TV_HOST_DEVICE_INLINE
ShapeBase
(
const
ShapeBase
<
MaxDim
>
&
shape
)
:
SimpleVector
<
int
,
MaxDim
>
(
shape
)
{}
ShapeBase
(
const
std
::
vector
<
int
>
&
arr
)
:
SimpleVector
<
int
,
MaxDim
>
(
arr
)
{}
...
...
setup.py
View file @
6299bc02
...
...
@@ -201,13 +201,15 @@ def get_extensions():
extra_compile_args
=
{
'cxx'
:
[]}
if
platform
.
system
()
!=
'Windows'
:
extra_compile_args
[
'cxx'
]
=
[
'-std=c++14'
]
if
parse_version
(
torch
.
__version__
)
<=
parse_version
(
'1.12.1'
):
extra_compile_args
[
'cxx'
]
=
[
'-std=c++14'
]
else
:
extra_compile_args
[
'cxx'
]
=
[
'-std=c++17'
]
else
:
# TODO: In Windows, C++17 is chosen to compile extensions in
# PyTorch2.0 , but a compile error will be reported.
# As a temporary solution, force the use of C++14.
if
parse_version
(
torch
.
__version__
)
>=
parse_version
(
'2.0.0'
):
if
parse_version
(
torch
.
__version__
)
<=
parse_version
(
'1.12.1'
):
extra_compile_args
[
'cxx'
]
=
[
'/std:c++14'
]
else
:
extra_compile_args
[
'cxx'
]
=
[
'/std:c++17'
]
include_dirs
=
[]
library_dirs
=
[]
...
...
@@ -418,7 +420,10 @@ def get_extensions():
# to compile those cpp files, so there is no need to add the
# argument
if
'nvcc'
in
extra_compile_args
and
platform
.
system
()
!=
'Windows'
:
extra_compile_args
[
'nvcc'
]
+=
[
'-std=c++14'
]
if
parse_version
(
torch
.
__version__
)
<=
parse_version
(
'1.12.1'
):
extra_compile_args
[
'nvcc'
]
+=
[
'-std=c++14'
]
else
:
extra_compile_args
[
'nvcc'
]
+=
[
'-std=c++17'
]
ext_ops
=
extension
(
name
=
ext_name
,
...
...
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