Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use RAFT for select_k on the gpu #656

Merged
merged 11 commits into from
May 24, 2023
Merged

use RAFT for select_k on the gpu #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b4ca6c1
use RAFT for select_k on the gpu
benfred May 19, 2023
334d9dd
clang-format
benfred May 19, 2023
9642148
fic
benfred May 20, 2023
735f19e
Merge branch 'main' into raft_select_k
benfred May 20, 2023
6147cbb
clang-format
benfred May 20, 2023
a6bbe09
require pascal gpu's and above
benfred May 21, 2023
46fee0a
consistent stream handling
benfred May 23, 2023
b66e26f
missing include
benfred May 23, 2023
b1bd1a8
check sorted outputs
benfred May 23, 2023
0fe4a68
sort outputs
benfred May 23, 2023
3bd7d81
clang-format
benfred May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions implicit/gpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ else()
add_cython_target(_cuda CXX)

# use rapids-cmake to install dependencies
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.02/RAPIDS.cmake
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.04/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(rapids-cmake)
Expand All @@ -29,30 +29,25 @@ else()
include(${rapids-cmake-dir}/cpm/rmm.cmake)
rapids_cpm_rmm(BUILD_EXPORT_SET implicit-exports INSTALL_EXPORT_SET implicit-exports)

# get faiss from git
rapids_cpm_find(FAISS 1.7.2
# get raft
# note: we're using RAFT in header only mode right now - mainly to reduce binary
# size of the compiled wheels
rapids_cpm_find(raft 23.06
CPM_ARGS
GIT_REPOSITORY https://github.com/facebookresearch/faiss.git
VERSION 1.7.2
GIT_REPOSITORY https://github.com/rapidsai/raft.git
GIT_TAG branch-23.06
DOWNLOAD_ONLY YES
)
FILE(GLOB FAISS_BLOCK_SELECT ${FAISS_SOURCE_DIR}/faiss/gpu/utils/blockselect/*.cu)
include_directories(${FAISS_SOURCE_DIR})
include_directories(${raft_SOURCE_DIR}/cpp/include)

set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --extended-lambda -Wno-deprecated-gpu-targets -Xfatbin=-compress-all")
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --extended-lambda -Wno-deprecated-gpu-targets -Xfatbin=-compress-all --expt-relaxed-constexpr")

add_library(_cuda MODULE ${_cuda}
als.cu
bpr.cu
matrix.cu
random.cu
knn.cu
# we need a limited subset of faiss for the blockselect code. rather than compile all of
# faiss, just include the minimal subset here
${FAISS_BLOCK_SELECT}
${FAISS_SOURCE_DIR}/faiss/gpu/utils/BlockSelectFloat.cu
${FAISS_SOURCE_DIR}/faiss/gpu/utils/DeviceUtils.cu
${FAISS_SOURCE_DIR}/faiss/gpu/GpuResources.cpp
)

python_extension_module(_cuda)
Expand All @@ -62,9 +57,9 @@ else()
set_target_properties(_cuda PROPERTIES CUDA_ARCHITECTURES $ENV{IMPLICIT_CUDA_ARCH})
else()
if (${CUDAToolkit_VERSION} VERSION_LESS "11.1.0")
set_target_properties(_cuda PROPERTIES CUDA_ARCHITECTURES "37;50;70;60;80")
set_target_properties(_cuda PROPERTIES CUDA_ARCHITECTURES "60;70;80")
else()
set_target_properties(_cuda PROPERTIES CUDA_ARCHITECTURES "37;50;70;60;80;86")
set_target_properties(_cuda PROPERTIES CUDA_ARCHITECTURES "60;70;80;86")
endif()
endif()
target_link_libraries(_cuda CUDA::cublas CUDA::curand rmm::rmm)
Expand Down
Loading