Merge pull request #30 from nicolas-chaulet/patch

Handle missing torch better

Author: tchaton

CHANGELOG.md

@@ -1,10 +1,15 @@
 # Unreleased
 
+# 0.6.0
+
+## Bug fix
+- Require pytorch implicitely and log nice message when missing
+
 # 0.5.3
 
 ## Update
 - ball query returns squared distance instead of distance
 - leaner Point Cloud struct that avoids copying data
 
 ## Bug fix
-- Pcakage would not install if pytorch is not already installed
+- Package would not install if pytorch is not already installed

pyproject.toml

@@ -25,5 +25,5 @@ exclude = '''
 '''
 
 [build-system]
-requires = ["setuptools>=41.0", "setuptools-scm", "wheel", "torch"]
+requires = ["setuptools>=41.0", "setuptools-scm", "wheel"]
 build-backend = "setuptools.build_meta"

setup.py

@@ -1,54 +1,71 @@
 from setuptools import setup, find_packages
-import torch
-from torch.utils.cpp_extension import (
-    BuildExtension,
-    CUDAExtension,
-    CUDA_HOME,
-    CppExtension,
-)
+
+try:
+    import torch
+    from torch.utils.cpp_extension import (
+        BuildExtension,
+        CUDAExtension,
+        CUDA_HOME,
+        CppExtension,
+    )
+    HAS_TORCH=True
+except:
+    HAS_TORCH=False
+    
 import glob
 
 from os import path
 this_directory = path.abspath(path.dirname(__file__))
 with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-TORCH_MAJOR = int(torch.__version__.split(".")[0])
-TORCH_MINOR = int(torch.__version__.split(".")[1])
-extra_compile_args = ["-O3"]
-if (TORCH_MAJOR > 1) or (TORCH_MAJOR == 1 and TORCH_MINOR > 2):
-    extra_compile_args += ["-DVERSION_GE_1_3"]
 
-ext_src_root = "cuda"
-ext_sources = glob.glob("{}/src/*.cpp".format(ext_src_root)) + glob.glob("{}/src/*.cu".format(ext_src_root))
+def get_ext_modules():
+    if not HAS_TORCH:
+        return []
+    TORCH_MAJOR = int(torch.__version__.split(".")[0])
+    TORCH_MINOR = int(torch.__version__.split(".")[1])
+    extra_compile_args = ["-O3"]
+    if (TORCH_MAJOR > 1) or (TORCH_MAJOR == 1 and TORCH_MINOR > 2):
+        extra_compile_args += ["-DVERSION_GE_1_3"]
 
-ext_modules = []
-if CUDA_HOME:
-    ext_modules.append(
-        CUDAExtension(
-            name="torch_points_kernels.points_cuda",
-            sources=ext_sources,
-            include_dirs=["{}/include".format(ext_src_root)],
-            extra_compile_args={"cxx": extra_compile_args, "nvcc": extra_compile_args,},
+    ext_src_root = "cuda"
+    ext_sources = glob.glob("{}/src/*.cpp".format(ext_src_root)) + glob.glob("{}/src/*.cu".format(ext_src_root))
+
+    ext_modules = []
+    if CUDA_HOME:
+        ext_modules.append(
+            CUDAExtension(
+                name="torch_points_kernels.points_cuda",
+                sources=ext_sources,
+                include_dirs=["{}/include".format(ext_src_root)],
+                extra_compile_args={"cxx": extra_compile_args, "nvcc": extra_compile_args,},
+            )
         )
-    )
 
-cpu_ext_src_root = "cpu"
-cpu_ext_sources = glob.glob("{}/src/*.cpp".format(cpu_ext_src_root))
+    cpu_ext_src_root = "cpu"
+    cpu_ext_sources = glob.glob("{}/src/*.cpp".format(cpu_ext_src_root))
 
-ext_modules.append(
-    CppExtension(
-        name="torch_points_kernels.points_cpu",
-        sources=cpu_ext_sources,
-        include_dirs=["{}/include".format(cpu_ext_src_root)],
-        extra_compile_args={"cxx": extra_compile_args,},
+    ext_modules.append(
+        CppExtension(
+            name="torch_points_kernels.points_cpu",
+            sources=cpu_ext_sources,
+            include_dirs=["{}/include".format(cpu_ext_src_root)],
+            extra_compile_args={"cxx": extra_compile_args,},
+        )
     )
-)
+    return ext_modules
+
+def get_cmdclass():
+    if HAS_TORCH:
+        return {"build_ext": BuildExtension}
+    else:
+        return {}
 
 requirements = ["torch>=1.1.0"]
 
 url = 'https://github.com/nicolas-chaulet/torch-points-kernels'
-__version__="0.5.3"
+__version__="0.6.0"
 setup(
     name="torch-points-kernels",
     version=__version__,
@@ -57,8 +74,8 @@
     url=url,
     download_url='{}/archive/{}.tar.gz'.format(url, __version__),
     install_requires=requirements,
-    ext_modules=ext_modules,
-    cmdclass={"build_ext": BuildExtension},
+    ext_modules=get_ext_modules(),
+    cmdclass=get_cmdclass(),
     long_description=long_description,
     long_description_content_type='text/markdown',
     classifiers=[