Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Added ONNX Runtime dependency
ozanarmagan3f7390d02e69
diff --git a/.gitignore b/.gitignoreindex 2004a627..c111898e 100644--- a/.gitignore+++ b/.gitignore@@ -12,4 +12,5 @@ cmake-build-release/bazel-*typesense-server-data/.clwb/.bazelproject-.vscode/settings.json\ No newline at end of file+.vscode/settings.json+/onnxruntime-prefix\ No newline at end of filediff --git a/BUILD b/BUILDindex 6ff72875..a272bb22 100644--- a/BUILD+++ b/BUILD@@ -37,6 +37,7 @@ cc_library(}),deps = [":headers",+ ":onnxruntime_lib","@com_github_brpc_braft//:braft","@com_github_brpc_brpc//:brpc","@com_github_google_glog//:glog",@@ -130,3 +131,131 @@ cc_test("ROOT_DIR="],)++load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")++__POSTFIX = """+mkdir -p $INSTALLDIR/lib+mkdir -p $INSTALLDIR/lib/_deps+mkdir -p $INSTALLDIR/lib/_deps/onnx-build+mkdir -p $INSTALLDIR/lib/_deps/re2-build+mkdir -p $INSTALLDIR/lib/_deps/abseil_cpp-build+mkdir -p $INSTALLDIR/lib/_deps/abseil_cpp-build/absl+mkdir -p $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/base+mkdir -p $INSTALLDIR/lib/_deps/protobuf-build+mkdir -p $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/container+mkdir -p $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/hash+mkdir -p $INSTALLDIR/lib/_deps/pytorch_cpuinfo-build+mkdir -p $INSTALLDIR/lib/_deps/pytorch_cpuinfo-build/deps+mkdir -p $INSTALLDIR/lib/_deps/pytorch_cpuinfo-build/deps/clog+mkdir -p $INSTALLDIR/lib/_deps/google_nsync-build+cp $BUILD_TMPDIR/_deps/onnx-build/libonnx.a $INSTALLDIR/lib/_deps/onnx-build+cp $BUILD_TMPDIR/_deps/onnx-build/libonnx_proto.a $INSTALLDIR/lib/_deps/onnx-build+cp $BUILD_TMPDIR/_deps/protobuf-build/libprotobuf-lite.a $INSTALLDIR/lib/_deps/protobuf-build+cp $BUILD_TMPDIR/_deps/re2-build/libre2.a $INSTALLDIR/lib/_deps/re2-build+cp $BUILD_TMPDIR/_deps/abseil_cpp-build/absl/base/libabsl_base.a $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/base+cp $BUILD_TMPDIR/_deps/abseil_cpp-build/absl/base/libabsl_throw_delegate.a $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/base+cp $BUILD_TMPDIR/_deps/abseil_cpp-build/absl/container/libabsl_raw_hash_set.a $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/container+cp $BUILD_TMPDIR/_deps/abseil_cpp-build/absl/hash/libabsl_hash.a $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/hash+cp $BUILD_TMPDIR/_deps/abseil_cpp-build/absl/hash/libabsl_city.a $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/hash+cp $BUILD_TMPDIR/_deps/abseil_cpp-build/absl/hash/libabsl_low_level_hash.a $INSTALLDIR/lib/_deps/abseil_cpp-build/absl/hash+cp $BUILD_TMPDIR/_deps/google_nsync-build/libnsync_cpp.a $INSTALLDIR/lib/_deps/google_nsync-build+cp $BUILD_TMPDIR/_deps/pytorch_cpuinfo-build/deps/clog/libclog.a $INSTALLDIR/lib/_deps/pytorch_cpuinfo-build/deps/clog+cp $BUILD_TMPDIR/_deps/pytorch_cpuinfo-build/libcpuinfo.a $INSTALLDIR/lib/_deps/pytorch_cpuinfo-build+"""++cmake(+ name = "onnxruntime",+ lib_source = "@onnx_runtime//:all_srcs",+ cache_entries = {'onnxruntime_RUN_ONNX_TESTS':'OFF',+'onnxruntime_GENERATE_TEST_REPORTS':'ON',+'onnxruntime_USE_MIMALLOC':'OFF',+'onnxruntime_ENABLE_PYTHON':'OFF',+'onnxruntime_BUILD_CSHARP':'OFF',+'onnxruntime_BUILD_JAVA':'OFF',+'onnxruntime_BUILD_NODEJS':'OFF',+'onnxruntime_BUILD_OBJC':'OFF',+'onnxruntime_BUILD_SHARED_LIB':'OFF',+'onnxruntime_BUILD_APPLE_FRAMEWORK':'OFF',+'onnxruntime_USE_DNNL':'OFF',+'onnxruntime_USE_NNAPI_BUILTIN':'OFF',+'onnxruntime_USE_RKNPU':'OFF',+'onnxruntime_USE_LLVM':'OFF',+'onnxruntime_ENABLE_MICROSOFT_INTERNAL':'OFF',+'onnxruntime_USE_VITISAI':'OFF',+'onnxruntime_USE_TENSORRT':'OFF',+'onnxruntime_SKIP_AND_PERFORM_FILTERED_TENSORRT_TESTS':'ON',+'onnxruntime_USE_TENSORRT_BUILTIN_PARSER':'OFF',+'onnxruntime_TENSORRT_PLACEHOLDER_BUILDER':'OFF', 'onnxruntime_USE_TVM':'OFF',+'onnxruntime_TVM_CUDA_RUNTIME':'OFF', 'onnxruntime_TVM_USE_HASH':'OFF',+'onnxruntime_USE_MIGRAPHX':'OFF', 'onnxruntime_CROSS_COMPILING':'OFF',+'onnxruntime_DISABLE_CONTRIB_OPS':'OFF', 'onnxruntime_DISABLE_ML_OPS':'OFF',+'onnxruntime_DISABLE_RTTI':'OFF', 'onnxruntime_DISABLE_EXCEPTIONS':'OFF',+'onnxruntime_MINIMAL_BUILD':'OFF', 'onnxruntime_EXTENDED_MINIMAL_BUILD':'OFF',+'onnxruntime_MINIMAL_BUILD_CUSTOM_OPS':'OFF', 'onnxruntime_REDUCED_OPS_BUILD':'OFF',+'onnxruntime_ENABLE_LANGUAGE_INTEROP_OPS':'OFF', 'onnxruntime_USE_DML':'OFF',+'onnxruntime_USE_WINML':'OFF', 'onnxruntime_BUILD_MS_EXPERIMENTAL_OPS':'OFF',+'onnxruntime_USE_TELEMETRY':'OFF', 'onnxruntime_ENABLE_LTO':'OFF',+'onnxruntime_USE_ACL':'OFF', 'onnxruntime_USE_ACL_1902':'OFF',+'onnxruntime_USE_ACL_1905':'OFF', 'onnxruntime_USE_ACL_1908':'OFF',+'onnxruntime_USE_ACL_2002':'OFF', 'onnxruntime_USE_ARMNN':'OFF',+'onnxruntime_ARMNN_RELU_USE_CPU':'ON', 'onnxruntime_ARMNN_BN_USE_CPU':'ON',+'onnxruntime_ENABLE_NVTX_PROFILE':'OFF', 'onnxruntime_ENABLE_TRAINING':'OFF',+'onnxruntime_ENABLE_TRAINING_OPS':'OFF', 'onnxruntime_ENABLE_TRAINING_APIS':'OFF',+'onnxruntime_ENABLE_CPU_FP16_OPS':'OFF', 'onnxruntime_USE_NCCL':'OFF',+'onnxruntime_BUILD_BENCHMARKS':'OFF', 'onnxruntime_USE_ROCM':'OFF',+'Onnxruntime_GCOV_COVERAGE':'OFF', 'onnxruntime_USE_MPI':'ON',+'onnxruntime_ENABLE_MEMORY_PROFILE':'OFF',+'onnxruntime_ENABLE_CUDA_LINE_NUMBER_INFO':'OFF',+'onnxruntime_BUILD_WEBASSEMBLY':'OFF', 'onnxruntime_BUILD_WEBASSEMBLY_STATIC_LIB':'OFF',+'onnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_CATCHING':'ON',+'onnxruntime_ENABLE_WEBASSEMBLY_API_EXCEPTION_CATCHING':'OFF',+'onnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_THROWING':'ON',+'onnxruntime_ENABLE_WEBASSEMBLY_THREADS':'OFF',+'onnxruntime_ENABLE_WEBASSEMBLY_DEBUG_INFO':'OFF',+'onnxruntime_ENABLE_WEBASSEMBLY_PROFILING':'OFF',+'onnxruntime_ENABLE_EAGER_MODE':'OFF', 'onnxruntime_ENABLE_LAZY_TENSOR':'OFF',+'onnxruntime_ENABLE_EXTERNAL_CUSTOM_OP_SCHEMAS':'OFF', 'onnxruntime_ENABLE_CUDA_PROFILING':'OFF',+'onnxruntime_ENABLE_ROCM_PROFILING':'OFF', 'onnxruntime_USE_XNNPACK':'OFF',+'onnxruntime_USE_CANN':'OFF', 'CMAKE_TLS_VERIFY':'ON', 'FETCHCONTENT_QUIET':'OFF',+'onnxruntime_PYBIND_EXPORT_OPSCHEMA':'OFF', 'onnxruntime_ENABLE_MEMLEAK_CHECKER':'OFF',+'CMAKE_BUILD_TYPE':'Release',+},+ working_directory="cmake",+ build_args= [+ "--config Release",+ "-j6"+ ],+ tags=["requires-network","no-sandbox"],+ features=["-default_compile_flags","-fno-canonical-system-headers", "-Wno-builtin-macro-redefined"],+ out_static_libs=[ "libonnxruntime_session.a",+ "libonnxruntime_optimizer.a",+ "libonnxruntime_providers.a",+ "libonnxruntime_util.a",+ "libonnxruntime_framework.a",+ "libonnxruntime_graph.a",+ "libonnxruntime_mlas.a",+ "libonnxruntime_common.a",+ "libonnxruntime_flatbuffers.a",+ "_deps/onnx-build/libonnx.a",+ "_deps/onnx-build/libonnx_proto.a",+ "_deps/protobuf-build/libprotobuf-lite.a",+ "_deps/re2-build/libre2.a",+ "_deps/abseil_cpp-build/absl/base/libabsl_base.a",+ "_deps/abseil_cpp-build/absl/base/libabsl_throw_delegate.a",+ "_deps/abseil_cpp-build/absl/container/libabsl_raw_hash_set.a",+ "_deps/abseil_cpp-build/absl/hash/libabsl_hash.a",+ "_deps/abseil_cpp-build/absl/hash/libabsl_city.a",+ "_deps/abseil_cpp-build/absl/hash/libabsl_low_level_hash.a",+ "_deps/google_nsync-build/libnsync_cpp.a",+ "_deps/pytorch_cpuinfo-build/libcpuinfo.a",+ "_deps/pytorch_cpuinfo-build/deps/clog/libclog.a",+ ],+ postfix_script=__POSTFIX+)++cc_library(+ name = "onnxruntime_lib",+ deps = ["//:onnxruntime", "@onnx_runtime//:ext_headers"],+ includes= ["onnxruntime/include/onnxruntime"]+)diff --git a/CMakeLists.txt b/CMakeLists.txtindex abe43774..dccc127f 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -1,11 +1,10 @@-cmake_minimum_required(VERSION 3.17.5)+cmake_minimum_required(VERSION 3.24.0)project(typesense)cmake_policy(SET CMP0074 NEW)cmake_policy(SET CMP0003 NEW)set(USE_SANTINIZER OFF)-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror=return-type -O2 -g -DNDEBUG")set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wno-unused-parameter -Werror=return-type -std=c++17 -O0 -g")set(DEP_ROOT_DIR ${CMAKE_SOURCE_DIR}/external-${CMAKE_SYSTEM_NAME})@@ -62,6 +61,7 @@ ELSE()set(ENV{CMAKE_FIND_LIBRARY_SUFFIXES} ".a")ENDIF()+include(cmake/onnxruntime.cmake)include(cmake/For.cmake)include(cmake/H2O.cmake)include(cmake/RocksDB.cmake)@@ -109,6 +109,7 @@ include_directories(${DEP_ROOT_DIR}/${LRUCACHE_NAME}/include)include_directories(${DEP_ROOT_DIR}/${KAKASI_NAME}/build/include)include_directories(${DEP_ROOT_DIR}/${KAKASI_NAME}/data)include_directories(${DEP_ROOT_DIR}/${HNSW_NAME})+include_directories(${DEP_ROOT_DIR}/${ONNX_NAME}/include/onnxruntime)link_directories(/usr/local/lib)link_directories(${DEP_ROOT_DIR}/${GTEST_NAME}/googletest/build)@@ -119,6 +120,18 @@ link_directories(${DEP_ROOT_DIR}/${ICONV_NAME}/lib/.libs)link_directories(${DEP_ROOT_DIR}/${JEMALLOC_NAME}/lib)link_directories(${DEP_ROOT_DIR}/${S2_NAME}/build)link_directories(${DEP_ROOT_DIR}/${KAKASI_NAME}/build/lib)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/onnx-build)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/re2-build)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/abseil_cpp-build)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/abseil_cpp-build/absl)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/abseil_cpp-build/absl/base)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/protobuf-build)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/abseil_cpp-build/absl/container)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/abseil_cpp-build/absl/hash)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/pytorch_cpuinfo-build)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/pytorch_cpuinfo-build/deps)+link_directories(${DEP_ROOT_DIR}/${ONNX_NAME}-build/lib/_deps/pytorch_cpuinfo-build/deps/clog)set(JEMALLOC_ROOT_DIR "${DEP_ROOT_DIR}/${JEMALLOC_NAME}")FIND_PACKAGE(Jemalloc REQUIRED)@@ -128,6 +141,51 @@ add_executable(search ${SRC_FILES} src/main/main.cpp)add_executable(benchmark ${SRC_FILES} src/main/benchmark.cpp)add_executable(typesense-test ${SRC_FILES} ${TEST_FILES})+add_library(ONNX_SESSION IMPORTED STATIC)+set_target_properties(ONNX_SESSION PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_session.a)+add_library(ONNX_OPT STATIC IMPORTED)+set_target_properties(ONNX_OPT PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_optimizer.a)+add_library(ONNX_PRO STATIC IMPORTED)+set_target_properties(ONNX_PRO PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_providers.a)+add_library(ONNX_UTL STATIC IMPORTED)+set_target_properties(ONNX_UTL PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_util.a)+add_library(ONNX_FRM STATIC IMPORTED)+set_target_properties(ONNX_FRM PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_framework.a)+add_library(ONNX_GRP STATIC IMPORTED)+set_target_properties(ONNX_GRP PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_graph.a)+add_library(ONNX_MLS STATIC IMPORTED)+set_target_properties(ONNX_MLS PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_mlas.a)+add_library(ONNX_CMN STATIC IMPORTED)+set_target_properties(ONNX_CMN PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_common.a)+add_library(ONNX_FLT STATIC IMPORTED)+set_target_properties(ONNX_FLT PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/libonnxruntime_flatbuffers.a)+add_library(ONNX STATIC IMPORTED)+set_target_properties(ONNX PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/onnx-build/libonnx.a)+add_library(ONNX_PRT STATIC IMPORTED)+set_target_properties(ONNX_PRT PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/onnx-build/libonnx_proto.a)+add_library(ONNX_PRTL STATIC IMPORTED)+set_target_properties(ONNX_PRTL PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/protobuf-build/libprotobuf-lite.a)+add_library(ONNX_RE STATIC IMPORTED)+set_target_properties(ONNX_RE PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/re2-build/libre2.a)+add_library(ABSL STATIC IMPORTED)+set_target_properties(ABSL PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/abseil_cpp-build/absl/base/libabsl_base.a)+add_library(ABSL_DEL STATIC IMPORTED)+set_target_properties(ABSL_DEL PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/abseil_cpp-build/absl/base/libabsl_throw_delegate.a)+add_library(ABSL_RW STATIC IMPORTED)+set_target_properties(ABSL_RW PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/abseil_cpp-build/absl/container/libabsl_raw_hash_set.a)+add_library(ABSL_HSH STATIC IMPORTED)+set_target_properties(ABSL_HSH PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/abseil_cpp-build/absl/hash/libabsl_hash.a)+add_library(ABSL_CTY STATIC IMPORTED)+set_target_properties(ABSL_CTY PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/abseil_cpp-build/absl/hash/libabsl_city.a)+add_library(ABSL_LL STATIC IMPORTED)+set_target_properties(ABSL_LL PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/abseil_cpp-build/absl/hash/libabsl_low_level_hash.a)+add_library(NSYNC STATIC IMPORTED)+set_target_properties(NSYNC PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/google_nsync-build/libnsync_cpp.a)+add_library(CPUI STATIC IMPORTED)+set_target_properties(CPUI PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/pytorch_cpuinfo-build/libcpuinfo.a)+add_library(CLOG STATIC IMPORTED)+set_target_properties(CLOG PROPERTIES IMPORTED_LOCATION ${DEP_ROOT_DIR}/${ONNX_NAME}-build/_deps/pytorch_cpuinfo-build/deps/clog/libclog.a)+target_compile_definitions(typesense-server PRIVATETYPESENSE_VERSION="${TYPESENSE_VERSION}"@@ -171,9 +229,11 @@ set(CORE_LIBS kakasi h2o-evloop braft brpc iconv ${ICU_ALL_LIBRARIES} ${CURL_LIB${LevelDB_LIBRARIES} ${ROCKSDB_LIBS}glog ${GFLAGS_LIBRARIES} ${PROTOBUF_LIBRARIES} ${STACKTRACE_LIBS}${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${JEMALLOC_LIBRARIES}- ${SYSTEM_LIBS} pthread dl ${STD_LIB})+ ${SYSTEM_LIBS} pthread dl ${STD_LIB} ONNX_SESSION ONNX_OPT ONNX_PRO ONNX_UTL ONNX_FRM ONNX_GRP ONNX_MLS ONNX_CMN ONNX_FLT ONNX ONNX_PRT ONNX_PRTL ONNX_RE ABSL ABSL_DEL ABSL_RW ABSL_HSH ABSL_CTY ABSL_LL NSYNC CPUI CLOG)target_link_libraries(typesense-server ${CORE_LIBS})target_link_libraries(search ${CORE_LIBS})target_link_libraries(benchmark ${CORE_LIBS})target_link_libraries(typesense-test ${CORE_LIBS} gtest gtest_main)++add_dependencies(typesense-server onnxruntime)\ No newline at end of filediff --git a/WORKSPACE b/WORKSPACEindex 8cb54a25..c8ff47e1 100644--- a/WORKSPACE+++ b/WORKSPACE@@ -13,7 +13,10 @@ bazel_compdb_deps()http_archive(name = "rules_foreign_cc",- patches = ["//bazel:foreign_cc.patch"],+ patches = ["//bazel:foreign_cc.patch", "//bazel:foreign_cc_version_compiler.patch"],+ patch_args = [+ "-p1",+ ],sha256 = "2a4d07cd64b0719b39a7c12218a3e507672b82a97b98c6a89d38565894cf7c51",strip_prefix = "rules_foreign_cc-0.9.0",url = "https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/0.9.0.tar.gz",@@ -21,7 +24,11 @@ http_archive(load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")-rules_foreign_cc_dependencies()+# This sets up some common toolchains for building targets. For more details, please see+# https://bazelbuild.github.io/rules_foreign_cc/0.9.0/flatten.html#rules_foreign_cc_dependencies+rules_foreign_cc_dependencies(+ cmake_version="3.25.0",+ ninja_version="1.11.1")# brpc and its dependenciesgit_repository(@@ -34,6 +41,33 @@ git_repository(remote = "https://github.com/apache/incubator-brpc.git",)+_ALL_CONTENT = """\+filegroup(+ name = "all_srcs",+ srcs = glob(["**"]),+ visibility = ["//visibility:public"],+)+++cc_library(+ name = "ext_headers",+ hdrs = glob(["cmake/external/onnxruntime-extensions/includes/**"]),+ strip_include_prefix = "cmake/external/onnxruntime-extensions/includes",+ visibility = ["//visibility:public"],+)+++"""++new_git_repository(+ name="onnx_runtime",+ branch= "main",+ build_file_content= _ALL_CONTENT,+ init_submodules= 1,+ recursive_init_submodules= 1,+ remote= "https://github.com/microsoft/onnxruntime"+)+new_git_repository(name = "com_github_madler_zlib",build_file = "//bazel:zlib.BUILD",diff --git a/bazel/foreign_cc.patch b/bazel/foreign_cc.patchindex 76fd5f77..5485bb96 100644--- a/bazel/foreign_cc.patch+++ b/bazel/foreign_cc.patch@@ -1,5 +1,5 @@---- foreign_cc/private/configure_script.bzl-+++ foreign_cc/private/configure_script.bzl+--- a/foreign_cc/private/configure_script.bzl++++ b/foreign_cc/private/configure_script.bzl@@ -70,7 +70,7 @@).lstrip())diff --git a/bazel/foreign_cc_version_compiler.patch b/bazel/foreign_cc_version_compiler.patchnew file mode 100644index 00000000..d668a1db--- /dev/null+++ b/bazel/foreign_cc_version_compiler.patch@@ -0,0 +1,283 @@+diff --git a/foreign_cc/private/cc_toolchain_util.bzl b/foreign_cc/private/cc_toolchain_util.bzl+index fd7fa4d..188dc5f 100644+--- a/foreign_cc/private/cc_toolchain_util.bzl++++ b/foreign_cc/private/cc_toolchain_util.bzl+@@ -265,15 +265,24 @@ def get_tools_info(ctx):+ cc_toolchain = cc_toolchain,+ )+++ cxx = cc_common.get_tool_for_action(++ feature_configuration = feature_configuration,++ action_name = ACTION_NAMES.cpp_compile,++ )++ cxx_splitted = cxx.split("/")++ if(cxx_splitted[-1] == "gcc"):++ cxx_splitted[-1] = "g++"++ cxx = "/".join(cxx_splitted)++ if(cxx_splitted[-1] == "clang"):++ cxx_splitted = "clang++"++ cxx = "/".join(cxx_splitted)+++ return CxxToolsInfo(+ cc = cc_common.get_tool_for_action(+ feature_configuration = feature_configuration,+ action_name = ACTION_NAMES.c_compile,+ ),+- cxx = cc_common.get_tool_for_action(+- feature_configuration = feature_configuration,+- action_name = ACTION_NAMES.cpp_compile,+- ),++ cxx = cxx,+ cxx_linker_static = cc_common.get_tool_for_action(+ feature_configuration = feature_configuration,+ action_name = ACTION_NAMES.cpp_link_static_library,+diff --git a/toolchains/built_toolchains.bzl b/toolchains/built_toolchains.bzl+index 5e59e79..ddf63a5 100644+--- a/toolchains/built_toolchains.bzl++++ b/toolchains/built_toolchains.bzl+@@ -28,6 +28,7 @@ _CMAKE_SRCS = {+ "3.22.4": [["https://github.com/Kitware/CMake/releases/download/v3.22.4/cmake-3.22.4.tar.gz"], "cmake-3.22.4", "5c55d0b0bc4c191549e3502b8f99a4fe892077611df22b4178cc020626e22a47"],+ "3.23.1": [["https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1.tar.gz"], "cmake-3.23.1", "33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3"],+ "3.23.2": [["https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2.tar.gz"], "cmake-3.23.2", "f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa"],++ "3.25.0": [["https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0.tar.gz"], "cmake-3.25.0", "306463f541555da0942e6f5a0736560f70c487178b9d94a5ae7f34d0538cdd48"],+ }++ # buildifier: disable=unnamed-macro+@@ -438,6 +439,18 @@ def _ninja_toolchain(version, register_toolchains):+ native.register_toolchains(+ "@rules_foreign_cc//toolchains:built_ninja_toolchain",+ )++ if version == "1.11.1":++ maybe(++ http_archive,++ name = "ninja_build_src",++ build_file_content = _ALL_CONTENT,++ sha256 = "31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea",++ strip_prefix = "ninja-1.11.1",++ urls = [++ "https://github.com/ninja-build/ninja/archive/v1.11.1.tar.gz",++ ],++ )++ return+ if version == "1.11.0":+ maybe(+ http_archive,+diff --git a/toolchains/prebuilt_toolchains.bzl b/toolchains/prebuilt_toolchains.bzl+index dabfb95..d9c38b4 100644+--- a/toolchains/prebuilt_toolchains.bzl++++ b/toolchains/prebuilt_toolchains.bzl+@@ -67,6 +67,115 @@ def prebuilt_toolchains(cmake_version, ninja_version, register_toolchains):+ _make_toolchains(register_toolchains)++ def _cmake_toolchains(version, register_toolchains):++ if "3.25.0" == version:++ maybe(++ http_archive,++ name = "cmake-3.25.0-linux-aarch64",++ urls = [++ "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-linux-aarch64.tar.gz",++ ],++ sha256 = "27da36d6debe9b30f5c498554ae40cd621a55736f5f2ae2618ed95722a59965a",++ strip_prefix = "cmake-3.25.0-linux-aarch64",++ build_file_content = _CMAKE_BUILD_FILE.format(++ bin = "cmake",++ env = "{}",++ ),++ )++++ maybe(++ http_archive,++ name = "cmake-3.25.0-linux-x86_64",++ urls = [++ "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-linux-x86_64.tar.gz",++ ],++ sha256 = "ac634d6f0a81d7089adc7be5acff66a6bee3b08615f9a947858ce92a9ef59c8b",++ strip_prefix = "cmake-3.25.0-linux-x86_64",++ build_file_content = _CMAKE_BUILD_FILE.format(++ bin = "cmake",++ env = "{}",++ ),++ )++++ maybe(++ http_archive,++ name = "cmake-3.25.0-macos-universal",++ urls = [++ "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-macos-universal.tar.gz",++ ],++ sha256 = "c088e761534a2078cd9d0581d39f02d3f9ed05302e33135b55c6d619b263b4c3",++ strip_prefix = "cmake-3.25.0-macos-universal/CMake.app/Contents",++ build_file_content = _CMAKE_BUILD_FILE.format(++ bin = "cmake",++ env = "{}",++ ),++ )++++ maybe(++ http_archive,++ name = "cmake-3.25.0-windows-i386",++ urls = [++ "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-i386.zip",++ ],++ sha256 = "ddd115257a19ff3dd18fc63f32a00ae742f8b62d2e39bc354629903512f99783",++ strip_prefix = "cmake-3.25.0-windows-i386",++ build_file_content = _CMAKE_BUILD_FILE.format(++ bin = "cmake.exe",++ env = "{}",++ ),++ )++++ maybe(++ http_archive,++ name = "cmake-3.25.0-windows-x86_64",++ urls = [++ "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-x86_64.zip",++ ],++ sha256 = "b46030c10cab1170355952f9ac59f7e6dabc248070fc53f15dff11d4ed2910f8",++ strip_prefix = "cmake-3.25.0-windows-x86_64",++ build_file_content = _CMAKE_BUILD_FILE.format(++ bin = "cmake.exe",++ env = "{}",++ ),++ )++++ # buildifier: leave-alone++ maybe(++ prebuilt_toolchains_repository,++ name = "cmake_3.25.0_toolchains",++ repos = {++ "cmake-3.25.0-linux-aarch64": [++ "@platforms//cpu:aarch64",++ "@platforms//os:linux",++ ],++ "cmake-3.25.0-linux-x86_64": [++ "@platforms//cpu:x86_64",++ "@platforms//os:linux",++ ],++ "cmake-3.25.0-macos-universal": [++ "@platforms//os:macos",++ ],++ "cmake-3.25.0-windows-i386": [++ "@platforms//cpu:x86_32",++ "@platforms//os:windows",++ ],++ "cmake-3.25.0-windows-x86_64": [++ "@platforms//cpu:x86_64",++ "@platforms//os:windows",++ ],++ },++ tool = "cmake",++ )++++ if register_toolchains:++ native.register_toolchains(++ "@cmake_3.25.0_toolchains//:cmake-3.25.0-linux-aarch64_toolchain",++ "@cmake_3.25.0_toolchains//:cmake-3.25.0-linux-x86_64_toolchain",++ "@cmake_3.25.0_toolchains//:cmake-3.25.0-macos-universal_toolchain",++ "@cmake_3.25.0_toolchains//:cmake-3.25.0-windows-i386_toolchain",++ "@cmake_3.25.0_toolchains//:cmake-3.25.0-windows-x86_64_toolchain",++ )++++ return+ if "3.23.2" == version:+ maybe(+ http_archive,+@@ -4196,6 +4305,78 @@ def _cmake_toolchains(version, register_toolchains):+ fail("Unsupported version: " + str(version))++ def _ninja_toolchains(version, register_toolchains):++ if "1.11.1" == version:++ maybe(++ http_archive,++ name = "ninja_1.11.1_linux",++ urls = [++ "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip",++ ],++ sha256 = "b901ba96e486dce377f9a070ed4ef3f79deb45f4ffe2938f8e7ddc69cfb3df77",++ strip_prefix = "",++ build_file_content = _NINJA_BUILD_FILE.format(++ bin = "ninja",++ env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",++ ),++ )++++ maybe(++ http_archive,++ name = "ninja_1.11.1_mac",++ urls = [++ "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip",++ ],++ sha256 = "482ecb23c59ae3d4f158029112de172dd96bb0e97549c4b1ca32d8fad11f873e",++ strip_prefix = "",++ build_file_content = _NINJA_BUILD_FILE.format(++ bin = "ninja",++ env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",++ ),++ )++++ maybe(++ http_archive,++ name = "ninja_1.11.1_win",++ urls = [++ "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip",++ ],++ sha256 = "524b344a1a9a55005eaf868d991e090ab8ce07fa109f1820d40e74642e289abc",++ strip_prefix = "",++ build_file_content = _NINJA_BUILD_FILE.format(++ bin = "ninja.exe",++ env = "{\"NINJA\": \"$(execpath :ninja_bin)\"}",++ ),++ )++++ # buildifier: leave-alone++ maybe(++ prebuilt_toolchains_repository,++ name = "ninja_1.11.1_toolchains",++ repos = {++ "ninja_1.11.1_linux": [++ "@platforms//cpu:x86_64",++ "@platforms//os:linux",++ ],++ "ninja_1.11.1_mac": [++ "@platforms//cpu:x86_64",++ "@platforms//os:macos",++ ],++ "ninja_1.11.1_win": [++ "@platforms//cpu:x86_64",++ "@platforms//os:windows",++ ],++ },++ tool = "ninja",++ )++++ if register_toolchains:++ native.register_toolchains(++ "@ninja_1.11.1_toolchains//:ninja_1.11.1_linux_toolchain",++ "@ninja_1.11.1_toolchains//:ninja_1.11.1_mac_toolchain",++ "@ninja_1.11.1_toolchains//:ninja_1.11.1_win_toolchain",++ )++++ return+ if "1.11.0" == version:+ maybe(+ http_archive,+diff --git a/toolchains/prebuilt_toolchains.py b/toolchains/prebuilt_toolchains.py+index 5288b27..a193021 100755+--- a/toolchains/prebuilt_toolchains.py++++ b/toolchains/prebuilt_toolchains.py+@@ -10,6 +10,7 @@ CMAKE_SHA256_URL_TEMPLATE = "https://cmake.org/files/v{minor}/cmake-{full}-SHA-2+ CMAKE_URL_TEMPLATE = "https://github.com/Kitware/CMake/releases/download/v{full}/{file}"++ CMAKE_VERSIONS = [++ "3.25.0",+ "3.23.2",+ "3.23.1",+ "3.22.4",+@@ -116,6 +117,7 @@ NINJA_TARGETS = {+ }++ NINJA_VERSIONS = (++ "1.11.1",+ "1.10.2",+ "1.10.1",+ "1.10.0",diff --git a/build.sh b/build.shindex 26d8c00b..d5f12a9b 100755--- a/build.sh+++ b/build.sh@@ -22,7 +22,7 @@ if [[ "$@" == *"--depclean"* ]]; thenficmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION -DCMAKE_BUILD_TYPE=Release -H$PROJECT_DIR -B$PROJECT_DIR/$BUILD_DIR-make typesense-server typesense-test -C $PROJECT_DIR/$BUILD_DIR+sudo cmake --build $PROJECT_DIR/$BUILD_DIR --target typesense-server --target typesense-testif [[ "$@" == *"--package-binary"* ]]; thenOS_FAMILY=$(echo `uname` | awk '{print tolower($0)}')diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmakenew file mode 100644index 00000000..a27be6f7--- /dev/null+++ b/cmake/onnxruntime.cmake@@ -0,0 +1,18 @@+project(onnxruntme)+set(ONNX_NAME onnxruntime)+include(ExternalProject)++if(NOT EXISTS ${DEP_ROOT_DIR}/${ONNX_NAME})+ file(MAKE_DIRECTORY ${DEP_ROOT_DIR}/${ONNX_NAME})+ file(MAKE_DIRECTORY ${DEP_ROOT_DIR}/${ONNX_NAME}-build)+endif()++ExternalProject_Add(+ onnxruntime+ GIT_REPOSITORY https://github.com/microsoft/onnxruntime+ GIT_TAG origin/main+ SOURCE_DIR ${DEP_ROOT_DIR}/${ONNX_NAME}+ BINARY_DIR ${DEP_ROOT_DIR}/${ONNX_NAME}-build+ CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEP_ROOT_DIR}/${ONNX_NAME}/cmake -B${DEP_ROOT_DIR}/${ONNX_NAME}-build -Donnxruntime_RUN_ONNX_TESTS=OFF -Donnxruntime_GENERATE_TEST_REPORTS=ON -Donnxruntime_USE_MIMALLOC=OFF -Donnxruntime_ENABLE_PYTHON=OFF -Donnxruntime_BUILD_CSHARP=OFF -Donnxruntime_BUILD_JAVA=OFF -Donnxruntime_BUILD_NODEJS=OFF -Donnxruntime_BUILD_OBJC=OFF -Donnxruntime_BUILD_SHARED_LIB=OFF -Donnxruntime_BUILD_APPLE_FRAMEWORK=OFF -Donnxruntime_USE_DNNL=OFF -Donnxruntime_USE_NNAPI_BUILTIN=OFF -Donnxruntime_USE_RKNPU=OFF -Donnxruntime_USE_LLVM=OFF -Donnxruntime_ENABLE_MICROSOFT_INTERNAL=OFF -Donnxruntime_USE_VITISAI=OFF -Donnxruntime_USE_TENSORRT=OFF -Donnxruntime_SKIP_AND_PERFORM_FILTERED_TENSORRT_TESTS=ON -Donnxruntime_USE_TENSORRT_BUILTIN_PARSER=OFF -Donnxruntime_TENSORRT_PLACEHOLDER_BUILDER=OFF -Donnxruntime_USE_TVM=OFF -Donnxruntime_TVM_CUDA_RUNTIME=OFF -Donnxruntime_TVM_USE_HASH=OFF -Donnxruntime_USE_MIGRAPHX=OFF -Donnxruntime_CROSS_COMPILING=OFF -Donnxruntime_DISABLE_CONTRIB_OPS=OFF -Donnxruntime_DISABLE_ML_OPS=OFF -Donnxruntime_DISABLE_RTTI=OFF -Donnxruntime_DISABLE_EXCEPTIONS=OFF -Donnxruntime_MINIMAL_BUILD=OFF -Donnxruntime_EXTENDED_MINIMAL_BUILD=OFF -Donnxruntime_MINIMAL_BUILD_CUSTOM_OPS=OFF -Donnxruntime_REDUCED_OPS_BUILD=OFF -Donnxruntime_ENABLE_LANGUAGE_INTEROP_OPS=OFF -Donnxruntime_USE_DML=OFF -Donnxruntime_USE_WINML=OFF -Donnxruntime_BUILD_MS_EXPERIMENTAL_OPS=OFF -Donnxruntime_USE_TELEMETRY=OFF -Donnxruntime_ENABLE_LTO=OFF -Donnxruntime_USE_ACL=OFF -Donnxruntime_USE_ACL_1902=OFF -Donnxruntime_USE_ACL_1905=OFF -Donnxruntime_USE_ACL_1908=OFF -Donnxruntime_USE_ACL_2002=OFF -Donnxruntime_USE_ARMNN=OFF -Donnxruntime_ARMNN_RELU_USE_CPU=ON -Donnxruntime_ARMNN_BN_USE_CPU=ON -Donnxruntime_ENABLE_NVTX_PROFILE=OFF -Donnxruntime_ENABLE_TRAINING=OFF -Donnxruntime_ENABLE_TRAINING_OPS=OFF -Donnxruntime_ENABLE_TRAINING_APIS=OFF -Donnxruntime_ENABLE_CPU_FP16_OPS=OFF -Donnxruntime_USE_NCCL=OFF -Donnxruntime_BUILD_BENCHMARKS=OFF -Donnxruntime_USE_ROCM=OFF -Donnxruntime_GCOV_COVERAGE=OFF -Donnxruntime_USE_MPI=ON -Donnxruntime_ENABLE_MEMORY_PROFILE=OFF -Donnxruntime_ENABLE_CUDA_LINE_NUMBER_INFO=OFF -Donnxruntime_BUILD_WEBASSEMBLY=OFF -Donnxruntime_BUILD_WEBASSEMBLY_STATIC_LIB=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_CATCHING=ON -Donnxruntime_ENABLE_WEBASSEMBLY_API_EXCEPTION_CATCHING=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_EXCEPTION_THROWING=ON -Donnxruntime_ENABLE_WEBASSEMBLY_THREADS=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_DEBUG_INFO=OFF -Donnxruntime_ENABLE_WEBASSEMBLY_PROFILING=OFF -Donnxruntime_ENABLE_EAGER_MODE=OFF -Donnxruntime_ENABLE_LAZY_TENSOR=OFF -Donnxruntime_ENABLE_EXTERNAL_CUSTOM_OP_SCHEMAS=OFF -Donnxruntime_ENABLE_CUDA_PROFILING=OFF -Donnxruntime_ENABLE_ROCM_PROFILING=OFF -Donnxruntime_USE_XNNPACK=OFF -Donnxruntime_USE_CANN=OFF -DCMAKE_TLS_VERIFY=ON -DFETCHCONTENT_QUIET=OFF -Donnxruntime_PYBIND_EXPORT_OPSCHEMA=OFF -Donnxruntime_ENABLE_MEMLEAK_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release+ BUILD_COMMAND ${CMAKE_COMMAND} --build ${DEP_ROOT_DIR}/${ONNX_NAME}-build --config Release -- -j8+)