Skip to content

Commit

Permalink
Merge pull request #34 from nicolas-chaulet/bug/install
Browse files Browse the repository at this point in the history
Fix install
  • Loading branch information
nicolas-chaulet authored May 20, 2020
2 parents 1367c6c + 42968ce commit de88f9c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ on:
jobs:
unittests:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.6
uses: actions/setup-python@v1
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 0.6.2

## Bug fix
- Fix install with pip > 19

# 0.6.1

## Bug fix
Expand Down
12 changes: 3 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
CUDA_HOME,
CppExtension,
)
HAS_TORCH=True
except:
HAS_TORCH=False
raise ModuleNotFoundError("Please install pytorch >= 1.1 before proceeding.")

import glob

Expand All @@ -21,8 +20,6 @@


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"]
Expand Down Expand Up @@ -57,15 +54,12 @@ def get_ext_modules():
return ext_modules

def get_cmdclass():
if HAS_TORCH:
return {"build_ext": BuildExtension}
else:
return {}
return {"build_ext": BuildExtension}

requirements = ["torch>=1.1.0"]

url = 'https://github.com/nicolas-chaulet/torch-points-kernels'
__version__="0.6.1"
__version__="0.6.2"
setup(
name="torch-points-kernels",
version=__version__,
Expand Down

0 comments on commit de88f9c

Please sign in to comment.