Skip to content
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

Update bindings to faiss v1.8.0 #77

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Update bindings to faiss v1.8.0 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7772b3
[faiss-sys] Update to v1.8.0
Enet4 Mar 24, 2024
f0820cb
(break) Remove train_residual method
Enet4 Mar 24, 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
2 changes: 1 addition & 1 deletion faiss-sys/faiss
Open in desktop
Submodule faiss updated 551 files
10 changes: 5 additions & 5 deletions faiss-sys/gen_bindings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
# Ensure that the submodule is updated and checked out in the intended revision
if ! which bindgen > /dev/null; then
echo "ERROR: `bindgen` not found. Please install using cargo:"
echo " cargo install bindgen"
echo " cargo install bindgen-cli --version=^0.69"
exit 1
fi

repo_url=https://github.com/facebookresearch/faiss
repo_rev=v1.7.2
repo_rev=v1.8.0
cuda_root=/opt/cuda

if [ ! -d faiss ]; then
git clone "$repo_url" faiss --branch "$repo_rev" --depth 1
fi

bindgen_opt='--size_t-is-usize --whitelist-function faiss_.* --whitelist-type idx_t|Faiss.* --opaque-type FILE'
bindgen_opt='--allowlist-function faiss_.* --allowlist-type idx_t|Faiss.* --opaque-type FILE'

headers=`ls faiss/c_api/*_c.h faiss/c_api/impl/*_c.h faiss/c_api/utils/*_c.h`
echo '// Auto-generated, do not edit!' > c_api.h
for header in $headers; do
echo "#include \""$header"\"" >> c_api.h;
done

cmd="bindgen --rust-target 1.33 $bindgen_opt c_api.h -o src/bindings.rs"
cmd="bindgen --rust-target 1.59 $bindgen_opt c_api.h -o src/bindings.rs"
echo ${cmd}
${cmd}

Expand All @@ -33,7 +33,7 @@ for header in $headers; do
echo "#include \""$header"\"" >> c_api.h;
done

cmd="bindgen --rust-target 1.33 $bindgen_opt c_api.h -o src/bindings_gpu.rs -- -Ifaiss/c_api -I$cuda_root/include"
cmd="bindgen --rust-target 1.59 $bindgen_opt c_api.h -o src/bindings_gpu.rs -- -Ifaiss/c_api -I$cuda_root/include"
echo ${cmd}
${cmd}

Expand Down
Loading
Loading