Fix swig osx

.circleci/config.yml

@@ -351,6 +351,9 @@ workflows:
       - build_conda:
           name: Linux arm64 (conda)
           exec: linux-arm64-cpu
+      - build_conda:
+          name: OSX arm64 (cmake)
+          exec: macosx-arm64-cpu
       - build_conda:
           name: Linux x86_64 packages
           exec: linux-x86_64-cpu

faiss/python/CMakeLists.txt

@@ -24,11 +24,6 @@ macro(configure_swigfaiss source)
     CPLUSPLUS ON
     USE_TARGET_INCLUDE_DIRECTORIES TRUE
   )
-  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32)
-    set_source_files_properties(${source} PROPERTIES
-      SWIG_FLAGS -DSWIGWORDSIZE64
-    )
-  endif()
   if(WIN32)
     set_source_files_properties(${source} PROPERTIES
       SWIG_FLAGS -DSWIGWIN

faiss/python/swigfaiss.swig

@@ -1022,14 +1022,17 @@ PyObject *swig_ptr (PyObject *a)
         return SWIG_NewPointerObj(data, SWIGTYPE_p_bool, 0);
     }
     if(PyArray_TYPE(ao) == NPY_UINT64) {
-#if (__SIZEOF_LONG__ == 8)
+    // Convert npy64 either long or long long  and it depends on how compiler define int64_t.
+    // In the 64bit machine, typically the int64_t should be long but it is not hold for Apple osx.
+    // In this case, we want to convert npy64 to long_Long in osx
+#if __SIZEOF_LONG__ == 8 && !(defined(__APPLE__) && defined(__MACH__))
         return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long, 0);
 #else
         return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long_long, 0);
 #endif
     }
     if(PyArray_TYPE(ao) == NPY_INT64) {
-#if  (__SIZEOF_LONG__ == 8)
+#if __SIZEOF_LONG__ == 8 && !(defined(__APPLE__) && defined(__MACH__))
         return SWIG_NewPointerObj(data, SWIGTYPE_p_long, 0);
 #else
         return SWIG_NewPointerObj(data, SWIGTYPE_p_long_long, 0);
@@ -1121,12 +1124,13 @@ int * cast_integer_to_int_ptr (int64_t x) {
 void * cast_integer_to_void_ptr (int64_t x) {
     return (void*)x;
 }
-
 %}
 
-
-
-
+/*
+Force OSX to generate SWIGTYPE_p_long since OSX will generate SWIGTYPE_p_long_long when it meets int64 by default
+*/
+%types(unsigned long*);
+%types(long*);