From 6a3321e13b72e196aa030d19084c38ee491e757b Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 20 Oct 2025 17:39:33 +0800 Subject: [PATCH 1/4] faiss: update to 1.12.0 --- packages/f/faiss/xmake.lua | 43 ++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/packages/f/faiss/xmake.lua b/packages/f/faiss/xmake.lua index 6c52132efb3..9ef5bfcfb85 100644 --- a/packages/f/faiss/xmake.lua +++ b/packages/f/faiss/xmake.lua @@ -1,5 +1,4 @@ package("faiss") - set_homepage("https://github.com/facebookresearch/faiss/") set_description("A library for efficient similarity search and clustering of dense vectors.") set_license("MIT") @@ -7,28 +6,46 @@ package("faiss") add_urls("https://github.com/facebookresearch/faiss/archive/refs/tags/$(version).tar.gz", "https://github.com/facebookresearch/faiss.git") add_versions("v1.7.0", "f86d346ac9f409ee30abe37e52f6cce366b7f60d3924d65719f40aa07ceb4bec") + add_versions("v1.12.0", "561376d1a44771bf1230fabeef9c81643468009b45a585382cf38d3a7a94990a") + + add_configs("gpu", {description = "Enable support for GPU indexes.", default = false, type = "boolean"}) + add_configs("gpu_static", {description = "Link GPU libraries statically.", default = false, type = "boolean"}) + add_configs("mkl", {description = "Enable MKL.", default = true, type = "boolean"}) + add_configs("python", {description = "Build Python extension.", default = false, type = "boolean"}) + add_configs("c_api", {description = "Build C API.", default = false, type = "boolean"}) + add_configs("lto", {description = "Enable Link-Time optimization.", default = false, type = "boolean"}) - add_deps("cmake") - add_deps("cuda", {system = true, optional = true}) - add_deps("mkl", "cuda", {system = true, optional = true}) if is_plat("linux") then add_syslinks("pthread") end - on_load("windows|x64", "linux", function (package) - if not find_package("mkl") then + + add_deps("cmake", "openmp") + add_deps("mkl", {system = true, optional = true}) + on_load(function (package) + if package:config("gpu") then + package:add("deps", "cuda") + end + if not find_package("mkl") or not package:config("mkl") then package:add("deps", "openblas") end end) - on_install("windows|x64", "linux", function (package) - io.replace("CMakeLists.txt", "add_subdirectory(demos)", "", {plain = true}) - io.replace("CMakeLists.txt", "add_subdirectory(tutorial/cpp)", "", {plain = true}) - local configs = {"-DFAISS_ENABLE_PYTHON=OFF", "-DBUILD_TESTING=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DFAISS_ENABLE_GPU=" .. (package:dep("cuda"):exists() and "ON" or "OFF")) + on_install("windows", "linux", "macosx", "bsd", function (package) + local configs = { + "-DBUILD_TESTING=OFF", + "-DFAISS_ENABLE_EXTRAS=OFF", + } + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DFAISS_ENABLE_GPU=" .. (package:config("gpu") and "ON" or "OFF")) + table.insert(configs, "-DFAISS_GPU_STATIC=" .. (package:config("gpu_static") and "ON" or "OFF")) + table.insert(configs, "-DFAISS_ENABLE_MKL=" .. (package:config("mkl") and "ON" or "OFF")) + table.insert(configs, "-DFAISS_ENABLE_PYTHON=" .. (package:config("python") and "ON" or "OFF")) + table.insert(configs, "-DFAISS_ENABLE_C_API=" .. (package:config("c_api") and "ON" or "OFF")) + table.insert(configs, "-DFAISS_ENABLE_LTO=" .. (package:config("lto") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:has_cxxtypes("faiss::MultiIndexQuantizer", {configs = {languages = "c++11"}, includes = "faiss/IndexPQ.h"})) + assert(package:has_cxxtypes("faiss::MultiIndexQuantizer", {configs = {languages = "c++17"}, includes = "faiss/IndexPQ.h"})) end) From a381176f0fd0ef505d6c7919c6a6af447423920d Mon Sep 17 00:00:00 2001 From: chooyy Date: Tue, 21 Oct 2025 09:54:32 +0800 Subject: [PATCH 2/4] update xmake.lua --- packages/f/faiss/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/f/faiss/xmake.lua b/packages/f/faiss/xmake.lua index 9ef5bfcfb85..2c6471ac69b 100644 --- a/packages/f/faiss/xmake.lua +++ b/packages/f/faiss/xmake.lua @@ -30,7 +30,7 @@ package("faiss") end end) - on_install("windows", "linux", "macosx", "bsd", function (package) + on_install("windows|x64", "linux", "macosx", function (package) local configs = { "-DBUILD_TESTING=OFF", "-DFAISS_ENABLE_EXTRAS=OFF", From 3e6f1c145f902d3650bfb3a239f29312089c3de2 Mon Sep 17 00:00:00 2001 From: choyy <68107073+choyy@users.noreply.github.com> Date: Sun, 26 Oct 2025 14:12:05 +0800 Subject: [PATCH 3/4] Update xmake.lua --- packages/f/faiss/xmake.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/f/faiss/xmake.lua b/packages/f/faiss/xmake.lua index 2c6471ac69b..2471e42327a 100644 --- a/packages/f/faiss/xmake.lua +++ b/packages/f/faiss/xmake.lua @@ -10,7 +10,7 @@ package("faiss") add_configs("gpu", {description = "Enable support for GPU indexes.", default = false, type = "boolean"}) add_configs("gpu_static", {description = "Link GPU libraries statically.", default = false, type = "boolean"}) - add_configs("mkl", {description = "Enable MKL.", default = true, type = "boolean"}) + add_configs("mkl", {description = "Enable MKL.", default = false, type = "boolean"}) add_configs("python", {description = "Build Python extension.", default = false, type = "boolean"}) add_configs("c_api", {description = "Build C API.", default = false, type = "boolean"}) add_configs("lto", {description = "Enable Link-Time optimization.", default = false, type = "boolean"}) @@ -20,12 +20,13 @@ package("faiss") end add_deps("cmake", "openmp") - add_deps("mkl", {system = true, optional = true}) on_load(function (package) if package:config("gpu") then package:add("deps", "cuda") end - if not find_package("mkl") or not package:config("mkl") then + if package:config("mkl") then + package:add("deps", "mkl", {system = true, optional = true}) + else package:add("deps", "openblas") end end) From fa98dff40ff477358db77986783e98b2c51a119c Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 27 Oct 2025 14:08:05 +0800 Subject: [PATCH 4/4] faiss: remove duplicate config --- packages/f/faiss/xmake.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/f/faiss/xmake.lua b/packages/f/faiss/xmake.lua index 2471e42327a..43854248a9d 100644 --- a/packages/f/faiss/xmake.lua +++ b/packages/f/faiss/xmake.lua @@ -13,7 +13,6 @@ package("faiss") add_configs("mkl", {description = "Enable MKL.", default = false, type = "boolean"}) add_configs("python", {description = "Build Python extension.", default = false, type = "boolean"}) add_configs("c_api", {description = "Build C API.", default = false, type = "boolean"}) - add_configs("lto", {description = "Enable Link-Time optimization.", default = false, type = "boolean"}) if is_plat("linux") then add_syslinks("pthread")