Fix: Wolfram bindings (#437)

Co-authored-by: Ash Vardanian <1983160+ashvardanian@users.noreply.github.com>

Author: batracos

wolfram/CMakeLists.txt

@@ -1,12 +1,52 @@
+cmake_minimum_required(VERSION 3.15.0)
 
-if(NOT WOLFRAM_PATH)
+project(usearch)
+
+if (NOT SYSTEMID)
+    # set system id and build platform
+    set(BITNESS 32)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(BITNESS 64)
+    endif ()
+
+    set(SYSTEMID NOTFOUND)
+
+    # Determine the current machine's systemid.
+    if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND BITNESS EQUAL 64)
+        if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+            set(SYSTEMID Linux-ARM64)
+        else ()
+            set(SYSTEMID Linux-x86-64)
+        endif ()
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND BITNESS EQUAL 64)
+        if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+            set(SYSTEMID MacOSX-ARM64)
+        else ()
+            set(SYSTEMID MacOSX-x86-64)
+        endif ()
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND BITNESS EQUAL 64)
+        if (_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM64")
+            set(SYSTEMID Windows-ARM64)
+        else ()
+            set(SYSTEMID Windows-x86-64)
+        endif ()
+    endif ()
+
+    if (NOT SYSTEMID)
+        message(FATAL_ERROR "Unable to determine System ID.")
+    endif ()
+endif ()
+
+if (NOT WOLFRAM_PATH)
     set(WOLFRAM_PATH "/usr/local/Wolfram/Mathematica")
-endif()
+endif ()
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WOLFRAM_PATH}/SystemFiles/Links/WSTP/DeveloperKit/Linux-x86-64/CompilerAdditions/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+                      "${WOLFRAM_PATH}/SystemFiles/Links/WSTP/DeveloperKit/${SYSTEMID}/CompilerAdditions/"
+)
 include(WSTP)
 include_directories("${WOLFRAM_PATH}/SystemFiles/IncludeFiles/C/")
-link_directories("${WOLFRAM_PATH}/SystemFiles/Libraries/Linux-x86-64/")
+link_directories("${WOLFRAM_PATH}/SystemFiles/Libraries/${SYSTEMID}/")
 
 add_library(usearchWFM SHARED lib.cpp)
 

wolfram/lib.cpp

@@ -4,32 +4,37 @@
 using namespace unum::usearch;
 
 using distance_t = distance_punned_t;
+using metric_t = metric_punned_t;
 using index_t = index_dense_t;
-using vector_view_t = span_gt<float>;
+using vector_view_t = span_gt<double>;
 
 using add_result_t = typename index_t::add_result_t;
 using search_result_t = typename index_t::search_result_t;
 using vector_key_t = typename index_t::vector_key_t;
+using dense_search_result_t = typename index_t::search_result_t;
 
 EXTERN_C DLLEXPORT int WolframLibrary_initialize(WolframLibraryData libData) { return LIBRARY_NO_ERROR; }
 EXTERN_C DLLEXPORT void WolframLibrary_uninitialize(WolframLibraryData libData) { return; }
 
 EXTERN_C DLLEXPORT int IndexCreate(WolframLibraryData libData, mint Argc, MArgument* Args, MArgument Res) {
-    index_config_t config;
     char* quantization_cstr = nullptr;
     char* metric_cstr = nullptr;
     try {
         quantization_cstr = MArgument_getUTF8String(Args[1]);
         metric_cstr = MArgument_getUTF8String(Args[0]);
         std::size_t dimensions = static_cast<std::size_t>(MArgument_getInteger(Args[2]));
         std::size_t capacity = static_cast<std::size_t>(MArgument_getInteger(Args[3]));
-        config.connectivity = static_cast<std::size_t>(MArgument_getInteger(Args[4]));
-        config.expansion_add = static_cast<std::size_t>(MArgument_getInteger(Args[5]));
-        config.expansion_search = static_cast<std::size_t>(MArgument_getInteger(Args[6]));
+        std::size_t connectivity = static_cast<std::size_t>(MArgument_getInteger(Args[4]));
+        std::size_t expansion_add = static_cast<std::size_t>(MArgument_getInteger(Args[5]));
+        std::size_t expansion_search = static_cast<std::size_t>(MArgument_getInteger(Args[6]));
+
+        index_dense_config_t config(connectivity, expansion_add, expansion_search);
 
         scalar_kind_t quantization = scalar_kind_from_name(quantization_cstr, std::strlen(quantization_cstr));
         metric_kind_t metric_kind = metric_from_name(metric_cstr, std::strlen(metric_cstr));
-        index_t index = make_punned<index_t>(metric_kind, dimensions, quantization, config);
+        metric_t metric = metric_t::builtin(dimensions, metric_kind, quantization);
+        index_t index = index_t::make(metric, config);
+
         index.reserve(capacity);
 
         index_t* result_ptr = new index_t(std::move(index));
@@ -115,12 +120,12 @@ EXTERN_C DLLEXPORT int IndexCapacity(WolframLibraryData libData, mint Argc, MArg
 EXTERN_C DLLEXPORT int IndexAdd(WolframLibraryData libData, mint Argc, MArgument* Args, MArgument Res) {
     char* path_cstr = nullptr;
     index_t* c_ptr = (index_t*)MArgument_getUTF8String(Args[0]);
-    float* vector_data = nullptr;
+    double* vector_data = nullptr;
     try {
         int key = MArgument_getInteger(Args[1]);
         MTensor tens = MArgument_getMTensor(Args[2]);
         std::size_t len = libData->MTensor_getFlattenedLength(tens);
-        vector_data = (float*)libData->MTensor_getRealData(tens);
+        vector_data = (double*)libData->MTensor_getRealData(tens);
         vector_view_t vector_span = vector_view_t{vector_data, len};
         c_ptr->add(key, vector_span);
     } catch (...) {
@@ -132,24 +137,30 @@ EXTERN_C DLLEXPORT int IndexAdd(WolframLibraryData libData, mint Argc, MArgument
 EXTERN_C DLLEXPORT int IndexSearch(WolframLibraryData libData, mint Argc, MArgument* Args, MArgument Res) {
     index_t* c_ptr = (index_t*)MArgument_getUTF8String(Args[0]);
     MTensor matches;
-    mint dims[] = {1};
     int wanted = MArgument_getInteger(Args[2]);
-    float* vector_data = nullptr;
-    int* matches_data = nullptr;
-    std::size_t found = 0;
+    double* vector_data = nullptr;
+    vector_key_t* matches_data = nullptr;
 
     try {
-        libData->MTensor_new(MType_Integer, 1, dims, &matches);
-
         MTensor tens = MArgument_getMTensor(Args[1]);
         std::size_t len = libData->MTensor_getFlattenedLength(tens);
-        vector_data = (float*)libData->MTensor_getRealData(tens);
+        vector_data = (double*)libData->MTensor_getRealData(tens);
         vector_view_t vector_span = vector_view_t{vector_data, len};
+        matches_data = (vector_key_t*)std::malloc(sizeof(vector_key_t) * wanted);
+        dense_search_result_t found = c_ptr->search(vector_span, static_cast<std::size_t>(wanted));
+
+        if (!found) {
+            found.error.release();
+            return LIBRARY_FUNCTION_ERROR;
+        }
+
+        std::size_t count = found.dump_to(matches_data);
+
+        mint dims = static_cast<mint>(count);
+        libData->MTensor_new(MType_Integer, 1, &dims, &matches);
 
-        matches_data = (int*)std::malloc(sizeof(int) * wanted);
-        found = c_ptr->search(vector_span, static_cast<std::size_t>(wanted), matches_data, nullptr);
-        for (mint i = 0; i < found; i++)
-            libData->MTensor_setInteger(matches, &i, matches_data[i]);
+        for (mint i = 1; i <= (mint)count; i++)
+            libData->MTensor_setInteger(matches, &i, static_cast<mint>(matches_data[i - 1]));
 
         MArgument_setMTensor(Res, matches);
     } catch (...) {