Skip to content

Commit cb53126

Browse files
authored
Drop cusparse (#302)
* update * update
1 parent 955b1cf commit cb53126

File tree

14 files changed

+35
-370
lines changed

14 files changed

+35
-370
lines changed

.github/workflows/building-conda.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# We have trouble building for Windows - drop for now.
1414
os: [ubuntu-18.04, macos-10.15] # windows-2019
1515
python-version: ['3.7', '3.8', '3.9', '3.10']
16-
torch-version: [1.13.0] # [1.12.0, 1.13.0]
16+
torch-version: [1.12.0, 1.13.0]
1717
cuda-version: ['cpu', 'cu102', 'cu113', 'cu116', 'cu117']
1818
exclude:
1919
- torch-version: 1.12.0
@@ -32,8 +32,6 @@ jobs:
3232
cuda-version: 'cu117'
3333
- os: windows-2019
3434
cuda-version: 'cu102'
35-
- os: windows-2019 # Complains about CUDA mismatch.
36-
python-version: '3.7'
3735

3836
steps:
3937
- uses: actions/checkout@v2

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(torchsparse)
33
set(CMAKE_CXX_STANDARD 14)
4-
set(TORCHSPARSE_VERSION 0.6.15)
4+
set(TORCHSPARSE_VERSION 0.6.16)
55
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
66

77
option(WITH_CUDA "Enable CUDA support" OFF)
@@ -34,9 +34,6 @@ endif()
3434

3535
add_library(${PROJECT_NAME} SHARED ${OPERATOR_SOURCES})
3636
target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES})
37-
if (WITH_CUDA)
38-
target_link_libraries(${PROJECT_NAME} PRIVATE ${CUDA_cusparse_LIBRARY})
39-
endif()
4037
if (WITH_PYTHON)
4138
target_link_libraries(${PROJECT_NAME} PRIVATE Python3::Python)
4239
endif()
@@ -95,15 +92,13 @@ install(FILES
9592
csrc/cpu/saint_cpu.h
9693
csrc/cpu/sample_cpu.h
9794
csrc/cpu/spmm_cpu.h
98-
csrc/cpu/spspmm_cpu.h
9995
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/cpu)
10096
if(WITH_CUDA)
10197
install(FILES
10298
csrc/cuda/convert_cuda.h
10399
csrc/cuda/diag_cuda.h
104100
csrc/cuda/rw_cuda.h
105101
csrc/cuda/spmm_cuda.h
106-
csrc/cuda/spspmm_cuda.h
107102
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/cuda)
108103
endif()
109104

conda/pytorch-sparse/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: pytorch-sparse
3-
version: 0.6.15
3+
version: 0.6.16
44

55
source:
66
path: ../..

csrc/cpu/spspmm_cpu.cpp

Lines changed: 0 additions & 106 deletions
This file was deleted.

csrc/cpu/spspmm_cpu.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

csrc/cuda/spspmm_cuda.cu

Lines changed: 0 additions & 147 deletions
This file was deleted.

csrc/cuda/spspmm_cuda.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

csrc/sparse.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,3 @@ spmm_min(torch::Tensor rowptr, torch::Tensor col,
7474
SPARSE_API std::tuple<torch::Tensor, torch::Tensor>
7575
spmm_max(torch::Tensor rowptr, torch::Tensor col,
7676
torch::optional<torch::Tensor> opt_value, torch::Tensor mat);
77-
78-
SPARSE_API
79-
std::tuple<torch::Tensor, torch::Tensor, torch::optional<torch::Tensor>>
80-
spspmm_sum(torch::Tensor rowptrA, torch::Tensor colA,
81-
torch::optional<torch::Tensor> optional_valueA,
82-
torch::Tensor rowptrB, torch::Tensor colB,
83-
torch::optional<torch::Tensor> optional_valueB, int64_t K);

csrc/spspmm.cpp

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)