Skip to content

Commit 16e2846

Browse files
Merge pull request #35 from nicolas-chaulet/bug/install
Remove pyproject.toml
2 parents d5c27f6 + 8adc980 commit 16e2846

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

pyproject.toml renamed to .black.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ exclude = '''
2323
| dist
2424
)/
2525
'''
26-
27-
[build-system]
28-
requires = ["setuptools>=41.0", "setuptools-scm", "wheel"]
29-
build-backend = "setuptools.build_meta"

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ repos:
1313
hooks:
1414
- id: black
1515
language_version: python3.6
16+
args: ["--config", ".black.toml"]
1617
- repo: local
1718
hooks:
1819
- id: clang-format

setup.py

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
)
1111
except:
1212
raise ModuleNotFoundError("Please install pytorch >= 1.1 before proceeding.")
13-
13+
1414
import glob
1515

1616
from os import path
17+
1718
this_directory = path.abspath(path.dirname(__file__))
18-
with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
19+
with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
1920
long_description = f.read()
2021

2122

@@ -27,7 +28,9 @@ def get_ext_modules():
2728
extra_compile_args += ["-DVERSION_GE_1_3"]
2829

2930
ext_src_root = "cuda"
30-
ext_sources = glob.glob("{}/src/*.cpp".format(ext_src_root)) + glob.glob("{}/src/*.cu".format(ext_src_root))
31+
ext_sources = glob.glob("{}/src/*.cpp".format(ext_src_root)) + glob.glob(
32+
"{}/src/*.cu".format(ext_src_root)
33+
)
3134

3235
ext_modules = []
3336
if CUDA_HOME:
@@ -36,7 +39,10 @@ def get_ext_modules():
3639
name="torch_points_kernels.points_cuda",
3740
sources=ext_sources,
3841
include_dirs=["{}/include".format(ext_src_root)],
39-
extra_compile_args={"cxx": extra_compile_args, "nvcc": extra_compile_args,},
42+
extra_compile_args={
43+
"cxx": extra_compile_args,
44+
"nvcc": extra_compile_args,
45+
},
4046
)
4147
)
4248

@@ -53,25 +59,28 @@ def get_ext_modules():
5359
)
5460
return ext_modules
5561

62+
5663
def get_cmdclass():
5764
return {"build_ext": BuildExtension}
5865

66+
5967
requirements = ["torch>=1.1.0"]
6068

61-
url = 'https://github.com/nicolas-chaulet/torch-points-kernels'
62-
__version__="0.6.2"
69+
url = "https://github.com/nicolas-chaulet/torch-points-kernels"
70+
__version__ = "0.6.3"
6371
setup(
6472
name="torch-points-kernels",
6573
version=__version__,
6674
author="Nicolas Chaulet",
6775
packages=find_packages(),
76+
description="PyTorch kernels for spatial operations on point clouds",
6877
url=url,
69-
download_url='{}/archive/{}.tar.gz'.format(url, __version__),
78+
download_url="{}/archive/{}.tar.gz".format(url, __version__),
7079
install_requires=requirements,
7180
ext_modules=get_ext_modules(),
7281
cmdclass=get_cmdclass(),
7382
long_description=long_description,
74-
long_description_content_type='text/markdown',
83+
long_description_content_type="text/markdown",
7584
classifiers=[
7685
"Programming Language :: Python :: 3",
7786
"License :: OSI Approved :: MIT License",

0 commit comments

Comments
 (0)