From 63cb37e1cb077d27ba647dfe52faba63ff24592d Mon Sep 17 00:00:00 2001 From: JaySon Date: Mon, 30 Sep 2024 16:18:35 +0800 Subject: [PATCH 1/5] tests: re-enable clang-tidy checks --- release-centos7-llvm/scripts/run-clang-tidy.py | 1 - 1 file changed, 1 deletion(-) diff --git a/release-centos7-llvm/scripts/run-clang-tidy.py b/release-centos7-llvm/scripts/run-clang-tidy.py index ff2291c8aec..7245f11a1e1 100755 --- a/release-centos7-llvm/scripts/run-clang-tidy.py +++ b/release-centos7-llvm/scripts/run-clang-tidy.py @@ -360,5 +360,4 @@ def main(): if __name__ == '__main__': - sys.exit(0)# temporary skip clang-tidy main() From a11536d091a015346a4d24d6a8c018042d39b646 Mon Sep 17 00:00:00 2001 From: Lloyd-Pottiger Date: Mon, 30 Sep 2024 18:12:33 +0800 Subject: [PATCH 2/5] fix drawin arm build Signed-off-by: Lloyd-Pottiger --- dbms/CMakeLists.txt | 2 +- dbms/src/VectorSearch/SimSIMD.h | 5 +++++ dbms/src/VectorSearch/USearch.h | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt index 821e2288fc8..e734f46c492 100644 --- a/dbms/CMakeLists.txt +++ b/dbms/CMakeLists.txt @@ -215,7 +215,7 @@ target_link_libraries(tiflash_vector_search tiflash_contrib::usearch tiflash_contrib::simsimd - fmt + fmt ) target_link_libraries (dbms diff --git a/dbms/src/VectorSearch/SimSIMD.h b/dbms/src/VectorSearch/SimSIMD.h index 274809aa81d..d1abe5c4da9 100644 --- a/dbms/src/VectorSearch/SimSIMD.h +++ b/dbms/src/VectorSearch/SimSIMD.h @@ -25,8 +25,13 @@ #define SIMSIMD_DYNAMIC_DISPATCH 0 // Force enable all target features. We will do our own dynamic dispatch. +#if defined (__APPLE__) +#define SIMSIMD_TARGET_NEON 0 +#define SIMSIMD_TARGET_SVE 0 +#else #define SIMSIMD_TARGET_NEON 1 #define SIMSIMD_TARGET_SVE 1 +#endif #define SIMSIMD_TARGET_HASWELL 1 #define SIMSIMD_TARGET_SKYLAKE 1 #define SIMSIMD_TARGET_ICE 1 diff --git a/dbms/src/VectorSearch/USearch.h b/dbms/src/VectorSearch/USearch.h index 4e47e06bd88..d5cb508b4a7 100644 --- a/dbms/src/VectorSearch/USearch.h +++ b/dbms/src/VectorSearch/USearch.h @@ -22,8 +22,13 @@ #define SIMSIMD_NATIVE_BF16 0 // Force enable all target features. +#if defined (__APPLE__) +#define SIMSIMD_TARGET_NEON 0 +#define SIMSIMD_TARGET_SVE 0 +#else #define SIMSIMD_TARGET_NEON 1 #define SIMSIMD_TARGET_SVE 1 +#endif #define SIMSIMD_TARGET_HASWELL 1 #define SIMSIMD_TARGET_SKYLAKE 1 #define SIMSIMD_TARGET_ICE 1 @@ -34,7 +39,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpass-failed" -#include +// #include #include #include #include From 1b8c4e7e8117c44b789b1b21f157f04a5817d087 Mon Sep 17 00:00:00 2001 From: Lloyd-Pottiger Date: Mon, 30 Sep 2024 18:17:13 +0800 Subject: [PATCH 3/5] fix drawin arm build Signed-off-by: Lloyd-Pottiger --- dbms/src/VectorSearch/USearch.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dbms/src/VectorSearch/USearch.h b/dbms/src/VectorSearch/USearch.h index d5cb508b4a7..e976b3c2e5b 100644 --- a/dbms/src/VectorSearch/USearch.h +++ b/dbms/src/VectorSearch/USearch.h @@ -39,7 +39,6 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpass-failed" -// #include #include #include #include From c999f934561c0c0975ce60bafc2f5bec0b7a27b4 Mon Sep 17 00:00:00 2001 From: JaySon-Huang Date: Mon, 30 Sep 2024 18:33:29 +0800 Subject: [PATCH 4/5] Format files --- dbms/src/VectorSearch/SimSIMD.h | 2 +- dbms/src/VectorSearch/USearch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbms/src/VectorSearch/SimSIMD.h b/dbms/src/VectorSearch/SimSIMD.h index d1abe5c4da9..89ebb06983c 100644 --- a/dbms/src/VectorSearch/SimSIMD.h +++ b/dbms/src/VectorSearch/SimSIMD.h @@ -25,7 +25,7 @@ #define SIMSIMD_DYNAMIC_DISPATCH 0 // Force enable all target features. We will do our own dynamic dispatch. -#if defined (__APPLE__) +#if defined(__APPLE__) #define SIMSIMD_TARGET_NEON 0 #define SIMSIMD_TARGET_SVE 0 #else diff --git a/dbms/src/VectorSearch/USearch.h b/dbms/src/VectorSearch/USearch.h index e976b3c2e5b..dda0889ff13 100644 --- a/dbms/src/VectorSearch/USearch.h +++ b/dbms/src/VectorSearch/USearch.h @@ -22,7 +22,7 @@ #define SIMSIMD_NATIVE_BF16 0 // Force enable all target features. -#if defined (__APPLE__) +#if defined(__APPLE__) #define SIMSIMD_TARGET_NEON 0 #define SIMSIMD_TARGET_SVE 0 #else From c20df67640952d49dcb38370aa1dce9e7cd3b6d9 Mon Sep 17 00:00:00 2001 From: JaySon-Huang Date: Mon, 30 Sep 2024 18:52:25 +0800 Subject: [PATCH 5/5] Fix --- dbms/src/VectorSearch/USearch.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbms/src/VectorSearch/USearch.h b/dbms/src/VectorSearch/USearch.h index dda0889ff13..78fb78523af 100644 --- a/dbms/src/VectorSearch/USearch.h +++ b/dbms/src/VectorSearch/USearch.h @@ -39,6 +39,9 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpass-failed" +#if !defined(__APPLE__) +#include +#endif #include #include #include