From 99fa5c6da0ddebb1e4b964ee3223720f73f9fa7c Mon Sep 17 00:00:00 2001
From: "q.yao" <yaoqian@sensetime.com>
Date: Mon, 4 Sep 2023 20:20:57 +0800
Subject: [PATCH] Support pre released pytorch2.1.0 (#2865)

---
 .../common/utils/spconv/tensorview/tensorview.h   |  5 +++--
 setup.py                                          | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h b/mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h
index 27745beaa5..66e01a8ed1 100644
--- a/mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h
+++ b/mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h
@@ -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) {}
diff --git a/setup.py b/setup.py
index 9393d04264..12f3f46b86 100644
--- a/setup.py
+++ b/setup.py
@@ -267,7 +267,15 @@ def get_extensions():
         # to compile those cpp files, so there is no need to add the
         # argument
         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:
+            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 = []
 
@@ -456,7 +464,10 @@ def get_mluops_version(file_path):
         # 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,