Skip to content

Commit

Permalink
Remove cutlass dependencies from cmake and elsewhere as it is no long…
Browse files Browse the repository at this point in the history
…er needed. (rapidsai#3717)

This PR depends on rapidsai#3691 
-- Remove cutlass dependencies from cmake and elsewhere as it is no longer needed.
-- also remove now redundant source files using cutlass

Authors:
  - Mahesh Doijade (https://github.com/mdoijade)

Approvers:
  - Thejaswi. N. S (https://github.com/teju85)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: rapidsai#3717
  • Loading branch information
mdoijade authored Apr 14, 2021
1 parent 67ea653 commit b8476fb
Show file tree
Hide file tree
Showing 15 changed files with 5 additions and 2,186 deletions.
1 change: 0 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ include(cmake/Dependencies.cmake)
set(CUML_INCLUDE_DIRECTORIES
${CUML_INCLUDE_DIR}
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
${CUTLASS_DIR}/src/cutlass
${SPDLOG_DIR}/src/spdlog/include
${FAISS_INCLUDE_DIRS}
${RAFT_DIR}/cpp/include
Expand Down
7 changes: 3 additions & 4 deletions cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ The external folder contains submodules that cuML depends on.

Current external submodules are:

1. [CUTLASS](https://github.com/NVIDIA/cutlass)
2. [CUB](https://github.com/NVlabs/cub)
3. [Faiss](https://github.com/facebookresearch/faiss)
4. [Google Test](https://github.com/google/googletest)
1. [CUB](https://github.com/NVlabs/cub)
2. [Faiss](https://github.com/facebookresearch/faiss)
3. [Google Test](https://github.com/google/googletest)

## Using cuML libraries

Expand Down
21 changes: 2 additions & 19 deletions cpp/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,6 @@ if(NOT CUB_IS_PART_OF_CTK)
INSTALL_COMMAND "")
endif(NOT CUB_IS_PART_OF_CTK)

##############################################################################
# - cutlass - (header only) --------------------------------------------------

set(CUTLASS_DIR ${CMAKE_CURRENT_BINARY_DIR}/cutlass CACHE STRING
"Path to the cutlass repo")
ExternalProject_Add(cutlass
GIT_REPOSITORY https://github.com/NVIDIA/cutlass.git
GIT_TAG v1.0.1
PREFIX ${CUTLASS_DIR}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND "")

##############################################################################
# - spdlog -------------------------------------------------------------------

Expand Down Expand Up @@ -257,13 +244,9 @@ set_property(TARGET benchmarklib PROPERTY

# TODO: Change to using build.sh and make targets instead of this

if(CUB_IS_PART_OF_CTK)
add_dependencies(cutlass raft)
else()
if(NOT CUB_IS_PART_OF_CTK)
add_dependencies(cub raft)
add_dependencies(cutlass cub)
endif(CUB_IS_PART_OF_CTK)
add_dependencies(spdlog cutlass)
endif(NOT CUB_IS_PART_OF_CTK)
add_dependencies(GTest::GTest spdlog)
add_dependencies(benchmark GTest::GTest)
add_dependencies(FAISS::FAISS benchmark)
Expand Down
160 changes: 0 additions & 160 deletions cpp/src_prims/distance/algo1.cuh

This file was deleted.

Loading

0 comments on commit b8476fb

Please sign in to comment.