Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Apr 4, 2023
1 parent 9a1ce62 commit 5384799
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cuda/cu116-Linux-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}
PATH=${CUDA_HOME}/bin:${PATH}

export FORCE_CUDA=1
export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
2 changes: 1 addition & 1 deletion .github/workflows/cuda/cu116-Linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ sudo apt-get -qq update
sudo apt install cuda-nvcc-11-6 cuda-libraries-dev-11-6
sudo apt clean

rm -f https://developer.download.nvidia.com/compute/cuda/11.5.2/local_installers/cuda-repo-${OS}-11-6-local_11.6.2-510.47.03-1_amd64.deb
rm -f https://developer.download.nvidia.com/compute/cuda/11.5.2/local_installers/cuda-repo-${OS}-11-6-local_11.6.2-510.47.03-1_amd64.deb
2 changes: 1 addition & 1 deletion .github/workflows/cuda/cu116-Windows-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ PATH=${CUDA_HOME}/bin:$PATH
PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/MSBuild/15.0/Bin:$PATH

export FORCE_CUDA=1
export TORCH_CUDA_ARCH_LIST="6.0+PTX"
export TORCH_CUDA_ARCH_LIST="6.0+PTX"
2 changes: 1 addition & 1 deletion .github/workflows/cuda/cu116-Windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ echo ""
echo "Installing from ${CUDA_FILE}..."
PowerShell -Command "Start-Process -FilePath \"${CUDA_FILE}\" -ArgumentList \"-s nvcc_${CUDA_SHORT} cuobjdump_${CUDA_SHORT} nvprune_${CUDA_SHORT} cupti_${CUDA_SHORT} cublas_dev_${CUDA_SHORT} cudart_${CUDA_SHORT} cufft_dev_${CUDA_SHORT} curand_dev_${CUDA_SHORT} cusolver_dev_${CUDA_SHORT} cusparse_dev_${CUDA_SHORT} thrust_${CUDA_SHORT} npp_dev_${CUDA_SHORT} nvrtc_dev_${CUDA_SHORT} nvml_dev_${CUDA_SHORT}\" -Wait -NoNewWindow"
echo "Done!"
rm -f "${CUDA_FILE}"
rm -f "${CUDA_FILE}"
2 changes: 1 addition & 1 deletion conda/torch-points-kernels/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
./build_conda.sh 3.9 1.9.0 cu111 # python, pytorch and cuda version
```

These conda scripts are based off of [pytorch_sparse](https://github.com/rusty1s/pytorch_sparse/tree/master/conda/pytorch-sparse), track changes there to update.
These conda scripts are based off of [pytorch_sparse](https://github.com/rusty1s/pytorch_sparse/tree/master/conda/pytorch-sparse), track changes there to update.
2 changes: 1 addition & 1 deletion conda/torch-points-kernels/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ copy "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\To
if errorlevel 1 exit 1

"%PYTHON%" -m pip install .
if errorlevel 1 exit 1
if errorlevel 1 exit 1
2 changes: 1 addition & 1 deletion conda/torch-points-kernels/run_test.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"%PYTHON%" -m unittest
if errorlevel 1 exit 1
if errorlevel 1 exit 1
2 changes: 1 addition & 1 deletion conda/torch-points-kernels/run_test.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$PYTHON -m unittest
$PYTHON -m unittest
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ def get_ext_modules():
extra_compile_args["cxx"] += ["-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)
)
ext_sources = glob.glob("{}/src/*.cpp".format(ext_src_root)) + glob.glob("{}/src/*.cu".format(ext_src_root))

ext_modules = []
if WITH_CUDA:
Expand Down
1 change: 0 additions & 1 deletion test/test_grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


class TestGroup(unittest.TestCase):

# input: points(b, c, n) idx(b, npoints, nsample)
# output: out(b, c, npoints, nsample)
def test_simple(self):
Expand Down

0 comments on commit 5384799

Please sign in to comment.