Skip to content

Fix faiss swig build with version > 4.2.x #3315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
junjieqi wants to merge 20 commits into from
Closed

Fix faiss swig build with version > 4.2.x #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a4b50e3
change cmake
junjieqi Mar 26, 2024
1fcb3de
Fix faiss swig build with version > 4.2.x
junjieqi Mar 25, 2024
f235edb
<Replace this line with a title. Use 1 line only, 67 chars or less>
junjieqi Mar 25, 2024
a3498c0
add debug output
junjieqi Mar 26, 2024
673f48a
remove broken change
junjieqi Mar 26, 2024
8de8d7e
add gcc version
junjieqi Mar 27, 2024
c89a574
Merge branch 'main' into fix-swig
junjieqi Mar 27, 2024
6598d49
try to fix test
junjieqi Mar 28, 2024
961713a
remove debug info
junjieqi Mar 28, 2024
8a17e06
add long long marco
junjieqi Mar 28, 2024
bd04ec6
Merge branch 'main' into fix-swig
junjieqi Mar 28, 2024
c1c8ee3
try sizeof_long
junjieqi Mar 28, 2024
9ce9a67
_LONG_WIDTH__
junjieqi Mar 28, 2024
50144f5
try another macro
junjieqi Mar 28, 2024
4432541
use size_of_long
junjieqi Mar 28, 2024
449964e
use size_of_long
junjieqi Mar 28, 2024
19b73ef
use __wordsize
junjieqi Mar 28, 2024
cb243fc
fix typo
junjieqi Mar 29, 2024
4a95427
use __SIZEOF_LONG__
junjieqi Mar 29, 2024
6b16647
use __SIZEOF_LONG__
junjieqi Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion conda/faiss-gpu-raft/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions faiss/python/swigfaiss.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,14 +1022,14 @@ PyObject *swig_ptr (PyObject *a)
return SWIG_NewPointerObj(data, SWIGTYPE_p_bool, 0);
}
if(PyArray_TYPE(ao) == NPY_UINT64) {
#ifdef SWIGWORDSIZE64
#if (__SIZEOF_LONG__ == 8)
return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long, 0);
Copy link
Contributor

@mdouze mdouze Mar 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will probably fail on windows and / or mac because sizeof(long) = 4 on these platforms. So there should be a way to differentiate between them.

#else
return SWIG_NewPointerObj(data, SWIGTYPE_p_unsigned_long_long, 0);
#endif
}
if(PyArray_TYPE(ao) == NPY_INT64) {
#ifdef SWIGWORDSIZE64
#if (__SIZEOF_LONG__ == 8)
return SWIG_NewPointerObj(data, SWIGTYPE_p_long, 0);
#else
return SWIG_NewPointerObj(data, SWIGTYPE_p_long_long, 0);
Expand Down