push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,60 @@
{
lib,
cmake,
faiss,
fetchFromGitHub,
gomp,
llvmPackages,
nlohmann_json,
sqlite,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sqlite-vss";
version = "0.1.2";
src = fetchFromGitHub {
owner = "asg017";
repo = "sqlite-vss";
rev = "v${finalAttrs.version}";
hash = "sha256-cb9UlSUAZp8B5NpNDBvJ2+ung98gjVKLxrM2Ek9fOcs=";
};
patches = [ ./use-nixpkgs-libs.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [
nlohmann_json
faiss
sqlite
]
++ lib.optional stdenv.hostPlatform.isLinux gomp
++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
SQLITE_VSS_CMAKE_VERSION = finalAttrs.version;
installPhase = ''
runHook preInstall
install -Dm444 -t "$out/lib" \
"libsqlite_vector0${stdenv.hostPlatform.extensions.staticLibrary}" \
"libsqlite_vss0${stdenv.hostPlatform.extensions.staticLibrary}" \
"vector0${stdenv.hostPlatform.extensions.sharedLibrary}" \
"vss0${stdenv.hostPlatform.extensions.sharedLibrary}"
runHook postInstall
'';
meta = with lib; {
# Low maintenance mode, doesn't support up-to-date faiss
# https://github.com/NixOS/nixpkgs/pull/330191#issuecomment-2252965866
broken = lib.versionAtLeast faiss.version "1.8.0";
description = "SQLite extension for efficient vector search based on Faiss";
homepage = "https://github.com/asg017/sqlite-vss";
changelog = "https://github.com/asg017/sqlite-vss/releases/tag/v${finalAttrs.version}";
license = licenses.mit;
platforms = platforms.unix;
};
})

View File

@@ -0,0 +1,41 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c59d993..5606b46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,15 +18,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(FAISS_ENABLE_GPU "" OFF)
option(FAISS_ENABLE_PYTHON "" OFF)
option(BUILD_TESTING "" OFF)
-add_subdirectory(./vendor/faiss)
-
-# vendor in SQLite amalgammation
-include_directories(vendor/sqlite)
-link_directories(BEFORE vendor/sqlite)
+find_package(OpenMP REQUIRED)
+find_package(faiss REQUIRED)
# Adding nlohmann_json for json parsing
set(JSON_BuildTests OFF CACHE INTERNAL "")
-add_subdirectory(vendor/json)
+find_package(nlohmann_json REQUIRED)
# ================================== sqlite-vector ================================== #
add_library(sqlite-vector SHARED src/sqlite-vector.cpp)
@@ -49,7 +46,7 @@ target_compile_definitions(sqlite-vector-static PUBLIC SQLITE_CORE)
# ================================== sqlite-vss ================================== #
add_library(sqlite-vss SHARED src/sqlite-vss.cpp)
target_link_libraries(sqlite-vss sqlite3)
-target_link_libraries(sqlite-vss faiss_avx2)
+target_link_libraries(sqlite-vss faiss)
target_include_directories(sqlite-vss PUBLIC "${PROJECT_BINARY_DIR}")
set_target_properties(sqlite-vss PROPERTIES PREFIX "")
@@ -58,7 +55,7 @@ set_target_properties(sqlite-vss PROPERTIES OUTPUT_NAME "vss0")
# ============================== sqlite-vss-static =============================== #
add_library(sqlite-vss-static STATIC src/sqlite-vss.cpp)
target_link_libraries(sqlite-vss-static PRIVATE sqlite3)
-target_link_libraries(sqlite-vss-static PUBLIC faiss_avx2)
+target_link_libraries(sqlite-vss-static PUBLIC faiss)
target_link_options(sqlite-vss-static PRIVATE "-Wl,-all_load")
target_include_directories(sqlite-vss-static PUBLIC "${PROJECT_BINARY_DIR}")
set_target_properties(sqlite-vss-static PROPERTIES OUTPUT_NAME "sqlite_vss0")