Fix faiss swig build with version > 4.2.x

.circleci/config.yml

@@ -224,15 +224,15 @@ jobs:
  - run:
  name: Install env using main channel
  command: |
- conda install -y -q python=3.11 cmake make swig=4.0.2 mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64
+ conda install -y -q python=3.11 cmake make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64=11.2 sysroot_linux-64
  - when:
  condition:
  equal: [ "ON", << parameters.raft >> ]
  steps:
  - run:
  name: Install env using conda-forge channel
  command: |
- conda install -y -q python=3.11 cmake make swig=4.0.2 mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64=2.28 libraft cuda-version=11.8 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-11.8.0" -c conda-forge
+ conda install -y -q python=3.11 cmake make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64=11.2 sysroot_linux-64=2.28 libraft cuda-version=11.8 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-11.8.0" -c conda-forge
  - when:
  condition:
  and:

conda/faiss-gpu-raft/meta.yaml

@@ -84,7 +84,7 @@ outputs:
  build:
  - {{ compiler('cxx') }}
  - sysroot_linux-64 =2.17 # [linux64]
- - swig =4.0.2
+ - swig
  - cmake >=3.23.1
  - make # [not win]
  host:

faiss/python/swigfaiss.swig

@@ -1022,17 +1022,17 @@ PyObject *swig_ptr (PyObject *a)
  return SWIG_NewPointerObj(data, SWIGTYPE_p_bool, 0);
  }
  if(PyArray_TYPE(ao) == NPY_UINT64) {
-#ifdef SWIGWORDSIZE64
- return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long, 0);
-#else
+#if (__WORDSIZE == 32)
  return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long_long, 0);
+#else
+ return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long, 0);
 #endif
  }
  if(PyArray_TYPE(ao) == NPY_INT64) {
-#ifdef SWIGWORDSIZE64
- return SWIG_NewPointerObj(data, SWIGTYPE_p_long, 0);
+#if (__WORDSIZE == 32)
+ return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long_long, 0);
 #else
- return SWIG_NewPointerObj(data, SWIGTYPE_p_long_long, 0);
+ return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long, 0);
 #endif
  }
  PyErr_SetString(PyExc_ValueError, "did not recognize array type");