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

hide RAFT #pragma deprecation warnings #114

Merged
merged 8 commits into from
May 23, 2024
Merged

hide RAFT #pragma deprecation warnings #114

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37a8fb8
hide RAFT #pragma deprecation warnings
trxcllnt May 10, 2024
f986ef8
Merge branch 'branch-24.06' into fix/hide-raft-deprecation-warnings
cjnolet May 10, 2024
c0ff9ac
fix reorder warning turned into an error
trxcllnt May 13, 2024
3993f02
fix unused-but-set-variable warning as error
trxcllnt May 13, 2024
d754f38
Merge branch 'branch-24.06' into fix/hide-raft-deprecation-warnings
cjnolet May 16, 2024
b33b38f
Merge branch 'branch-24.06' of github.com:rapidsai/cuvs into fix/hide…
trxcllnt May 17, 2024
9a50872
Merge branch 'branch-24.06' into fix/hide-raft-deprecation-warnings
cjnolet May 21, 2024
d0c66e9
Merge branch 'branch-24.06' into fix/hide-raft-deprecation-warnings
trxcllnt May 21, 2024
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
28 changes: 14 additions & 14 deletions cpp/cmake/modules/ConfigureCUDA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,45 @@
# =============================================================================

if(DISABLE_DEPRECATION_WARNINGS)
list(APPEND RAFT_CXX_FLAGS -Wno-deprecated-declarations)
list(APPEND RAFT_CUDA_FLAGS -Xcompiler=-Wno-deprecated-declarations)
list(APPEND CUVS_CXX_FLAGS -Wno-deprecated-declarations -DRAFT_HIDE_DEPRECATION_WARNINGS)
list(APPEND CUVS_CUDA_FLAGS -Xcompiler=-Wno-deprecated-declarations -DRAFT_HIDE_DEPRECATION_WARNINGS)
endif()

# Be very strict when compiling with GCC as host compiler (and thus more lenient when compiling with
# clang)
if(CMAKE_COMPILER_IS_GNUCXX)
list(APPEND RAFT_CXX_FLAGS -Wall -Werror -Wno-unknown-pragmas -Wno-error=deprecated-declarations)
list(APPEND RAFT_CUDA_FLAGS -Xcompiler=-Wall,-Werror,-Wno-error=deprecated-declarations)
list(APPEND CUVS_CXX_FLAGS -Wall -Werror -Wno-unknown-pragmas -Wno-error=deprecated-declarations)
list(APPEND CUVS_CUDA_FLAGS -Xcompiler=-Wall,-Werror,-Wno-error=deprecated-declarations)

# set warnings as errors
if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.2.0)
list(APPEND RAFT_CUDA_FLAGS -Werror=all-warnings)
list(APPEND CUVS_CUDA_FLAGS -Werror=all-warnings)
endif()
endif()

if(CUDA_LOG_COMPILE_TIME)
list(APPEND RAFT_CUDA_FLAGS "--time=nvcc_compile_log.csv")
list(APPEND CUVS_CUDA_FLAGS "--time=nvcc_compile_log.csv")
endif()

list(APPEND RAFT_CUDA_FLAGS --expt-extended-lambda --expt-relaxed-constexpr)
list(APPEND RAFT_CXX_FLAGS "-DCUDA_API_PER_THREAD_DEFAULT_STREAM")
list(APPEND RAFT_CUDA_FLAGS "-DCUDA_API_PER_THREAD_DEFAULT_STREAM")
list(APPEND CUVS_CUDA_FLAGS --expt-extended-lambda --expt-relaxed-constexpr)
list(APPEND CUVS_CXX_FLAGS "-DCUDA_API_PER_THREAD_DEFAULT_STREAM")
list(APPEND CUVS_CUDA_FLAGS "-DCUDA_API_PER_THREAD_DEFAULT_STREAM")
# make sure we produce smallest binary size
list(APPEND RAFT_CUDA_FLAGS -Xfatbin=-compress-all)
list(APPEND CUVS_CUDA_FLAGS -Xfatbin=-compress-all)

# Option to enable line info in CUDA device compilation to allow introspection when profiling /
# memchecking
if(CUDA_ENABLE_LINEINFO)
list(APPEND RAFT_CUDA_FLAGS -lineinfo)
list(APPEND CUVS_CUDA_FLAGS -lineinfo)
endif()

if(OpenMP_FOUND)
list(APPEND RAFT_CUDA_FLAGS -Xcompiler=${OpenMP_CXX_FLAGS})
list(APPEND CUVS_CUDA_FLAGS -Xcompiler=${OpenMP_CXX_FLAGS})
endif()

# Debug options
if(CMAKE_BUILD_TYPE MATCHES Debug)
message(VERBOSE "RAFT: Building with debugging flags")
list(APPEND RAFT_CUDA_FLAGS -G -Xcompiler=-rdynamic)
list(APPEND RAFT_CUDA_FLAGS -Xptxas --suppress-stack-size-warning)
list(APPEND CUVS_CUDA_FLAGS -G -Xcompiler=-rdynamic)
list(APPEND CUVS_CUDA_FLAGS -Xptxas --suppress-stack-size-warning)
endif()
6 changes: 3 additions & 3 deletions cpp/src/neighbors/ivf_pq_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ index<IdxT>::index(raft::resources const& handle,
pq_bits_(pq_bits),
pq_dim_(pq_dim == 0 ? calculate_pq_dim(dim) : pq_dim),
conservative_memory_allocation_(conservative_memory_allocation),
pq_centers_{raft::make_device_mdarray<float>(handle, make_pq_centers_extents())},
lists_{n_lists},
rotation_matrix_{
raft::make_device_matrix<float, uint32_t>(handle, this->rot_dim(), this->dim())},
list_sizes_{raft::make_device_vector<uint32_t, uint32_t>(handle, n_lists)},
pq_centers_{raft::make_device_mdarray<float>(handle, make_pq_centers_extents())},
centers_{raft::make_device_matrix<float, uint32_t>(handle, n_lists, this->dim_ext())},
centers_rot_{raft::make_device_matrix<float, uint32_t>(handle, n_lists, this->rot_dim())},
rotation_matrix_{
raft::make_device_matrix<float, uint32_t>(handle, this->rot_dim(), this->dim())},
data_ptrs_{raft::make_device_vector<uint8_t*, uint32_t>(handle, n_lists)},
inds_ptrs_{raft::make_device_vector<IdxT*, uint32_t>(handle, n_lists)},
accum_sorted_sizes_{raft::make_host_vector<IdxT, uint32_t>(n_lists + 1)}
Expand Down
1 change: 0 additions & 1 deletion cpp/test/neighbors/ann_ivf_pq.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ class ivf_pq_test : public ::testing::TestWithParam<ivf_pq_inputs> {
cuvs::Compare<uint8_t>{}));

// Another test with the API that take list_data directly
auto list_data = index->lists()[label]->data.view();
uint32_t n_take = 4;
ASSERT_TRUE(row_offset + n_take < n_rows);
auto codes2 = raft::make_device_matrix<uint8_t>(handle_, n_take, index->pq_dim());
Expand Down
Loading