diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a6911b8..cea5b6a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -4,15 +4,15 @@ on: pull_request: push: branches: - - master + - "master" jobs: unittests: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.7, 3.8] - torch-version: [1.10.0, 1.11.0, 1.12.0] + os: ["ubuntu-latest"] + python-version: ["3.10"] + torch-version: ["2.0.1", "2.1.1", "2.2.1", "2.3.1", "2.4.1"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -23,15 +23,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install "numpy<=1.21" scikit-learn flake8 setuptools numba - - - name: Install torch ${{ matrix.torch-version }} windows + linux - if: ${{matrix.os != 'macos-latest'}} - run: pip install torch==${{ matrix.torch-version }}+cpu -f https://download.pytorch.org/whl/torch_stable.html - - name: Install torch ${{ matrix.torch-version }} macos - if: ${{matrix.os == 'macos-latest'}} - run: pip install torch==${{ matrix.torch-version }} - + pip install "numpy==1.26.4" scikit-learn flake8 setuptools numba + - name: Install Torch ${{ matrix.torch-version }} + run: pip install torch==${{ matrix.torch-version }}+cpu -f https://download.pytorch.org/whl/torch - name: Build package run: | python setup.py build_ext --inplace diff --git a/.gitignore b/.gitignore index 83b0a15..a43a4db 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ build .vscode/ dist/ torch_points_kernels.egg-info/ +.idea/ diff --git a/setup.py b/setup.py index 5530374..156ed59 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ def get_ext_modules(): if WITH_CUDA: nvcc_flags = os.getenv("NVCC_FLAGS", "") nvcc_flags = [] if nvcc_flags == "" else nvcc_flags.split(" ") - nvcc_flags += ["-arch=sm_35", "--expt-relaxed-constexpr", "-O2"] + nvcc_flags += ["--expt-relaxed-constexpr", "-O2"] extra_compile_args["nvcc"] = nvcc_flags ext_modules.append(