From 538479960d4285656ad4047ebbc2e5346bdf2ac4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 05:45:52 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/cuda/cu116-Linux-env.sh | 2 +- .github/workflows/cuda/cu116-Linux.sh | 2 +- .github/workflows/cuda/cu116-Windows-env.sh | 2 +- .github/workflows/cuda/cu116-Windows.sh | 2 +- conda/torch-points-kernels/README.md | 2 +- conda/torch-points-kernels/bld.bat | 2 +- conda/torch-points-kernels/run_test.bat | 2 +- conda/torch-points-kernels/run_test.sh | 2 +- setup.py | 4 +--- test/test_grouping.py | 1 - 10 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cuda/cu116-Linux-env.sh b/.github/workflows/cuda/cu116-Linux-env.sh index 1fe663c..fe31894 100644 --- a/.github/workflows/cuda/cu116-Linux-env.sh +++ b/.github/workflows/cuda/cu116-Linux-env.sh @@ -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" \ No newline at end of file +export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6" diff --git a/.github/workflows/cuda/cu116-Linux.sh b/.github/workflows/cuda/cu116-Linux.sh index 4f5c4c7..28cda58 100644 --- a/.github/workflows/cuda/cu116-Linux.sh +++ b/.github/workflows/cuda/cu116-Linux.sh @@ -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 \ No newline at end of file +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 diff --git a/.github/workflows/cuda/cu116-Windows-env.sh b/.github/workflows/cuda/cu116-Windows-env.sh index 74ec597..3a662fb 100644 --- a/.github/workflows/cuda/cu116-Windows-env.sh +++ b/.github/workflows/cuda/cu116-Windows-env.sh @@ -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" \ No newline at end of file +export TORCH_CUDA_ARCH_LIST="6.0+PTX" diff --git a/.github/workflows/cuda/cu116-Windows.sh b/.github/workflows/cuda/cu116-Windows.sh index e834e28..db2559c 100644 --- a/.github/workflows/cuda/cu116-Windows.sh +++ b/.github/workflows/cuda/cu116-Windows.sh @@ -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}" \ No newline at end of file +rm -f "${CUDA_FILE}" diff --git a/conda/torch-points-kernels/README.md b/conda/torch-points-kernels/README.md index c6f5044..b3bc465 100644 --- a/conda/torch-points-kernels/README.md +++ b/conda/torch-points-kernels/README.md @@ -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. \ No newline at end of file +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. diff --git a/conda/torch-points-kernels/bld.bat b/conda/torch-points-kernels/bld.bat index 786eee2..2a32f9e 100644 --- a/conda/torch-points-kernels/bld.bat +++ b/conda/torch-points-kernels/bld.bat @@ -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 \ No newline at end of file +if errorlevel 1 exit 1 diff --git a/conda/torch-points-kernels/run_test.bat b/conda/torch-points-kernels/run_test.bat index 1f094bd..4a23541 100644 --- a/conda/torch-points-kernels/run_test.bat +++ b/conda/torch-points-kernels/run_test.bat @@ -1,2 +1,2 @@ "%PYTHON%" -m unittest -if errorlevel 1 exit 1 \ No newline at end of file +if errorlevel 1 exit 1 diff --git a/conda/torch-points-kernels/run_test.sh b/conda/torch-points-kernels/run_test.sh index 5ad56e0..3565036 100644 --- a/conda/torch-points-kernels/run_test.sh +++ b/conda/torch-points-kernels/run_test.sh @@ -1 +1 @@ -$PYTHON -m unittest \ No newline at end of file +$PYTHON -m unittest diff --git a/setup.py b/setup.py index 88abbf7..b83b32e 100644 --- a/setup.py +++ b/setup.py @@ -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: diff --git a/test/test_grouping.py b/test/test_grouping.py index 49d02ba..3c3dc01 100644 --- a/test/test_grouping.py +++ b/test/test_grouping.py @@ -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):