admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-02-02 01:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow compile on cuda 11 (#6139)

Browse Source 
Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
This commit is contained in:
shengjun.li 2021-06-28 10:50:14 +08:00 committed by GitHub
parent 3fc8123645
commit f1847cc489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/CMakeLists.txt
View File

@ -203,7 +203,7 @@ if (MILVUS_GPU_VERSION)
include_directories(${CUDA_INCLUDE_DIRS})
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
set(cuda_lib
${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
nvidia-ml
cudart
cublas
)

8
core/src/index/thirdparty/faiss/gpu/utils/DeviceUtils.cu vendored
View File

@ -111,10 +111,12 @@ int getDeviceForAddress(const void* p) {
FAISS_ASSERT_FMT(err == cudaErrorInvalidValue,
"unknown error %d", (int) err);
return -1;
} else if (att.memoryType == cudaMemoryTypeHost) {
return -1;
}
if (att.type == cudaMemoryTypeDevice) {
return att.device;
} else {
return att.device;
return -1;
}
}

2
core/unittest/CMakeLists.txt
View File

@ -221,7 +221,7 @@ if (MILVUS_GPU_VERSION)
include_directories("${CUDA_INCLUDE_DIRS}")
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
set(unittest_libs ${unittest_libs}
${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
nvidia-ml
)
endif ()