Skip to content

Commit 8a9ce5b

Browse files
Merge pull request #24 from nicolas-chaulet/renaming
Renaming
2 parents 55c3605 + c4d95fc commit 8a9ce5b

File tree

12 files changed

+70
-22
lines changed

12 files changed

+70
-22
lines changed

.github/workflows/deploy.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
on:
2+
push:
3+
tags:
4+
- 'v*'
5+
6+
name: Deploy
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v1
13+
- name: Set up Python 3.6
14+
uses: actions/setup-python@v1
15+
with:
16+
python-version: 3.6
17+
- name: Install dependencies
18+
run: |
19+
python -m pip install --upgrade pip
20+
pip install torch numpy scikit-learn flake8 setuptools wheel twine
21+
- name: Build package
22+
run: |
23+
python setup.py build_ext --inplace
24+
- name: Lint with flake8
25+
run: |
26+
# stop the build if there are Python syntax errors or undefined names
27+
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
28+
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
29+
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
30+
- name: Test with unittest
31+
run: |
32+
python -m unittest -v
33+
- name: Build package
34+
run: |
35+
python setup.py sdist
36+
- name: Publish package
37+
uses: pypa/gh-action-pypi-publish@master
38+
with:
39+
user: __token__
40+
password: ${{ secrets.PYPI_PASSWORD }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ build
3636

3737
.vscode/
3838
dist/
39-
torch_points.egg-info/
39+
torch_points_kernels.egg-info/

README.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# torch-points
2-
Pytorch kernels for pointnet++ like architectures
1+
# 3D Point Cloud Kernels
2+
Pytorch CPU and CUDA kernels for spatial search and interpolation for 3D point clouds.
33

44
## Installation
55
Requires torch version 1.0 or higher. To install a specific version replace the version number with a given tag.
66
```
7-
pip install git+https://github.com/nicolas-chaulet/torch-points.git#v0.2.3
7+
pip install git+https://github.com/nicolas-chaulet/torch-points-kernels.git#v0.5.0
88
```
99
or with poetry:
1010
```
11-
poetry add git+https://github.com/nicolas-chaulet/torch-points.git#v0.2.3
11+
poetry add git+https://github.com/nicolas-chaulet/torch-points.git#v0.5.0
1212
```
1313

1414
## Usage
1515
```
1616
import torch
17-
import torch_points.points_cuda
17+
import torch_points_kernels.points_cuda
1818
```
1919

2020
## Build and test
@@ -25,10 +25,7 @@ python -m unittest
2525

2626
## Projects using those kernels.
2727

28-
[```Pytorch Point Cloud Benchmark```](https://github.com/nicolas-chaulet/deeppointcloud-benchmarks) by
29-
* [Thomas Chaton](https://github.com/tchaton)
30-
* Nicolas Chaulet
31-
* [Tristan Heywood](https://github.com/tristanheywood)
28+
[```Pytorch Point Cloud Benchmark```](https://github.com/nicolas-chaulet/deeppointcloud-benchmarks)
3229

3330
## Credit
3431

setup.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
)
99
import glob
1010

11+
from os import path
12+
this_directory = path.abspath(path.dirname(__file__))
13+
with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
14+
long_description = f.read()
15+
1116
TORCH_MAJOR = int(torch.__version__.split(".")[0])
1217
TORCH_MINOR = int(torch.__version__.split(".")[1])
1318
extra_compile_args = []
@@ -21,7 +26,7 @@
2126
if CUDA_HOME:
2227
ext_modules.append(
2328
CUDAExtension(
24-
name="torch_points.points_cuda",
29+
name="torch_points_kernels.points_cuda",
2530
sources=ext_sources,
2631
include_dirs=["{}/include".format(ext_src_root)],
2732
extra_compile_args={"cxx": extra_compile_args, "nvcc": extra_compile_args,},
@@ -33,7 +38,7 @@
3338

3439
ext_modules.append(
3540
CppExtension(
36-
name="torch_points.points_cpu",
41+
name="torch_points_kernels.points_cpu",
3742
sources=cpu_ext_sources,
3843
include_dirs=["{}/include".format(cpu_ext_src_root)],
3944
extra_compile_args={"cxx": extra_compile_args,},
@@ -42,12 +47,18 @@
4247

4348
requirements = ["torch>=1.1.0"]
4449

50+
url = 'https://github.com/nicolas-chaulet/torch-points-kernels'
51+
__version__="0.5.1"
4552
setup(
46-
name="torch_points",
47-
version="0.4.1",
53+
name="torch-points-kernels",
54+
version=__version__,
4855
author="Nicolas Chaulet",
4956
packages=find_packages(),
57+
url=url,
58+
download_url='{}/archive/{}.tar.gz'.format(url, __version__),
5059
install_requires=requirements,
5160
ext_modules=ext_modules,
5261
cmdclass={"build_ext": BuildExtension},
62+
long_description=long_description,
63+
long_description_content_type='text/markdown'
5364
)

test/test_ballquerry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import unittest
22
import torch
3-
from torch_points import ball_query
3+
from torch_points_kernels import ball_query
44
import numpy.testing as npt
55
import numpy as np
66
from sklearn.neighbors import KDTree

test/test_fps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ROOT = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
77
sys.path.insert(0, ROOT)
88

9-
from torch_points.points_cpu import fps
9+
from torch_points_kernels.points_cpu import fps
1010

1111

1212
class TestFps(unittest.TestCase):

test/test_grouping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import torch
33
import numpy as np
44
import numpy.testing as npt
5-
from torch_points import grouping_operation
5+
from torch_points_kernels import grouping_operation
66

77

88
class TestGroup(unittest.TestCase):

test/test_interpolate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import unittest
22
import torch
33
from torch.autograd import gradcheck
4-
from torch_points import three_interpolate, three_nn
4+
from torch_points_kernels import three_interpolate, three_nn
55

66
from . import run_if_cuda
77

test/test_knn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ROOT = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
77
sys.path.insert(0, ROOT)
88

9-
from torch_points import three_nn, knn
9+
from torch_points_kernels import three_nn, knn
1010
from . import run_if_cuda
1111

1212

File renamed without changes.

0 commit comments

Comments
 (0)