mmcv之前修改追加

mmcv/ops/csrc/common/utils/spconv/tensorview/tensorview.h

@@ -27,7 +27,7 @@
 
 namespace tv {
 
-#ifdef __NVCC__
+#ifdef __CUDACC__
 #define TV_HOST_DEVICE_INLINE __forceinline__ __device__ __host__
 #define TV_DEVICE_INLINE __forceinline__ __device__
 #define TV_HOST_DEVICE __device__ __host__

mmcv/ops/csrc/pytorch/cuda/fused_spconv_ops_cuda.cu

 #include <cuda_runtime_api.h>
 #include <torch/script.h>
+#include "../spconv_utils.h"
 #include <utils/spconv/spconv/indice.h>
 #include <utils/spconv/spconv/reordering.h>
 
-#include "../spconv_utils.h"
+//#include "../spconv_utils.h"
 #include "pytorch_cuda_helper.hpp"
 
 torch::Tensor FusedIndiceConvBatchnormCUDAKernelLauncher(

mmcv/ops/csrc/pytorch/cuda/sparse_indice.cu

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <ATen/ATen.h>
+#include "../spconv_utils.h"
 #include <utils/spconv/spconv/indice.h>
 #include <utils/spconv/spconv/mp_helper.h>
 #include <utils/spconv/tensorview/helper_launch.h>
@@ -23,7 +24,7 @@
 #include <spconv/indice.cuh>
 #include <type_traits>
 
-#include "../spconv_utils.h"
+//#include "../spconv_utils.h"
 #include "pytorch_cuda_helper.hpp"
 
 namespace functor {

mmcv/ops/csrc/pytorch/cuda/sparse_maxpool.cu

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <ATen/ATen.h>
+#include "../spconv_utils.h"
 #include <utils/spconv/spconv/maxpool.h>
 #include <utils/spconv/spconv/mp_helper.h>
 #include <utils/spconv/tensorview/helper_launch.h>
@@ -23,7 +24,7 @@
 #include <type_traits>
 #include <utils/spconv/tensorview/helper_kernel.cuh>
 
-#include "../spconv_utils.h"
+//#include "../spconv_utils.h"
 #include "pytorch_cuda_helper.hpp"
 
 template <typename scalar_t, typename Index, int NumTLP, int NumILP>

mmcv/ops/csrc/pytorch/cuda/sparse_pool_ops_cuda.cu

 #include <cuda_runtime_api.h>
 #include <torch/script.h>
+#include "../spconv_utils.h"
 #include <utils/spconv/spconv/maxpool.h>
 
-#include "../spconv_utils.h"
+//#include "../spconv_utils.h"
 #include "pytorch_cuda_helper.hpp"
 
 torch::Tensor IndiceMaxpoolForwardCUDAKernelLauncher(torch::Tensor features,

mmcv/ops/csrc/pytorch/cuda/sparse_reordering.cu

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <ATen/ATen.h>
+#include "../spconv_utils.h"
 #include <utils/spconv/spconv/mp_helper.h>
 #include <utils/spconv/spconv/reordering.h>
 #include <utils/spconv/tensorview/helper_launch.h>
@@ -24,7 +25,7 @@
 #include <type_traits>
 #include <utils/spconv/tensorview/helper_kernel.cuh>
 
-#include "../spconv_utils.h"
+//#include "../spconv_utils.h"
 #include "pytorch_cuda_helper.hpp"
 
 namespace functor {

mmcv/ops/csrc/pytorch/cuda/spconv_ops_cuda.cu

 #include <cuda_runtime_api.h>
 #include <torch/script.h>
+#include "../spconv_utils.h"
 #include <utils/spconv/spconv/indice.h>
 #include <utils/spconv/spconv/reordering.h>
 
-#include "../spconv_utils.h"
+//#include "../spconv_utils.h"
 #include "pytorch_cuda_helper.hpp"
 
 template <unsigned NDim>

setup.py

@@ -5,6 +5,9 @@ import re
 import warnings
 from pkg_resources import DistributionNotFound, get_distribution
 from setuptools import find_packages, setup
+import subprocess
+from typing import Optional, Union
+from pathlib import Path
 
 EXT_TYPE = ''
 try:
@@ -24,6 +27,29 @@ except ModuleNotFoundError:
     cmd_class = {}
     print('Skip building ext ops due to the absence of torch.')
 
+def get_sha(pytorch_root: Union[str, Path]) -> str:
+    try:
+        return subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=pytorch_root).decode('ascii').strip()
+    except Exception:
+        return 'Unknown'
+
+
+def get_version_add(sha: Optional[str] = None) -> str:
+    mmcv_root = Path(__file__).parent.parent
+    add_version_path = mmcv_root / "mmcv" / "version.py"
+    if sha != 'Unknown':
+        if sha is None:
+            sha = get_sha(mmcv_root)
+        version = 'git' + sha[:7]
+
+    if os.getenv('MMCV_BUILD_VERSION'):
+        version_dtk = os.getenv('MMCV_BUILD_VERSION', "")
+        version += "." + version_dtk
+
+    with open(add_version_path, encoding="utf-8",mode="a") as file:
+        file.write("__version__=__version__+'+{}'\n".format(version))
+    file.close()
+
 
 def choose_requirement(primary, secondary):
     """If some version of primary requirement installed, return primary, else
@@ -38,6 +64,7 @@ def choose_requirement(primary, secondary):
 
 
 def get_version():
+    get_version_add()
     version_file = 'mmcv/version.py'
     with open(version_file, encoding='utf-8') as f:
         exec(compile(f.read(), version_file, 'exec'))
@@ -290,6 +317,7 @@ def get_extensions():
                 glob.glob('./mmcv/ops/csrc/pytorch/cuda/*.cpp')
             extension = CUDAExtension
             include_dirs.append(os.path.abspath('./mmcv/ops/csrc/common'))
+            include_dirs.append(os.path.abspath('./mmcv/ops/csrc/pytorch'))
             include_dirs.append(os.path.abspath('./mmcv/ops/csrc/common/cuda'))
         elif (hasattr(torch, 'is_mlu_available') and
                 torch.is_mlu_available()) or \
@@ -419,7 +447,34 @@ setup(
     description='OpenMMLab Computer Vision Foundation',
     keywords='computer vision',
     packages=find_packages(),
-    include_package_data=True,
+    #include_package_data=True,
+    include_package_data=False,
+    package_data = {
+        'mmcv': [
+            'model_zoo/*.json',
+            'ops/csrc/common/cuda/*.cuh',
+            'ops/csrc/common/hip/*.cuh',
+            'ops/csrc/common/cuda/*.hpp',
+            'ops/csrc/common/hip/*.hpp',
+            'ops/csrc/common/*.hpp',
+            'ops/csrc/pytorch/*.cpp',
+            'ops/csrc/pytorch/cuda/*.cu',
+            'ops/csrc/pytorch/hip/*.hip',
+            'ops/csrc/pytorch/cuda/*.cpp',
+            'ops/csrc/pytorch/hip/*.cpp',
+            'ops/csrc/pytorch/cpu/*.cpp',
+            'ops/csrc/parrots/*.h',
+            'ops/csrc/parrots/*.cpp',
+            'ops/csrc/commom/*.hpp',
+            'ops/csrc/commom/cuda/spconv/*.cuh',
+            'ops/csrc/commom/hip/spconv/*.cuh',
+            'ops/csrc/commom/utils/spconv/*.h',
+            'ops/csrc/commom/utils/spconv/spconv/*.h',
+            'ops/csrc/commom/utils/spconv/tensorview/*.h',
+            'ops/csrc/pytorch/*.h',
+        ]
+    },
+
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',