Skip to content

Rebased PR 1729 "Sparse dsp opt" #1763

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

Open
alexanderguzhva wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rebased PR 1729 "Sparse dsp opt" #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,13 @@ endif
# which requires std::partial_ordering from <compare> (a C++20 feature).
CONAN_SETTINGS := -s compiler.libcxx=$(LIBCXX) -s build_type=$(BUILD_TYPE) -s compiler.cppstd=20 -s:b compiler.cppstd=20

# DiskANN and liburing require libaio (Linux-only).
# DiskANN is enabled for Linux builds. CONAN_BASE_FLAGS already contains
# --build=missing, which builds liburing when it is present in the graph and
# lacks a binary package. A separate --build=liburing pattern is unsafe with
# Conan 1 because it is a hard error when a profile/option removes liburing
# from the resolved graph.
ifneq ($(UNAME_S),Darwin)
CONAN_SETTINGS += -o \&:with_diskann=True
ifndef WITH_GPU
CONAN_INSTALL_FLAGS += --build=liburing
endif
CONAN_FLAGS += -o with_diskann=True
endif

# GPU builds use cuVS.
Expand Down
8 changes: 8 additions & 0 deletions benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ endif()
benchmark_test(gen_hdf5_file hdf5/gen_hdf5_file.cpp)
benchmark_test(gen_fbin_file hdf5/gen_fbin_file.cpp)

# Sparse DSP benchmark (standalone, no HDF5/GTest required)
add_executable(benchmark_sparse_dsp benchmark_sparse_dsp.cpp)
target_link_libraries(benchmark_sparse_dsp knowhere)
if(NOT APPLE)
target_link_libraries(benchmark_sparse_dsp atomic)
endif()
install(TARGETS benchmark_sparse_dsp DESTINATION unittest)

# Sparse SIMD benchmark (x86_64 only, standalone, no HDF5 required)
# Only build on x86_64/AMD64, skip on ARM/aarch64/arm64
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64|amd64|X86_64)$")
Expand Down
Loading
Loading