-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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.
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
Fix swig osx #3357
Fix swig osx #3357
Conversation
This reverts commit 673f48a.
@junjieqi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
@junjieqi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please simplify
faiss/python/swigfaiss.swig
Outdated
|
||
|
||
|
||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is not necessary anymore I think
faiss/python/swigfaiss.swig
Outdated
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__)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here it is probably enough to test on
#ifndef __APPLE__
… fix_swig_osx merge .
@junjieqi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
@junjieqi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Summary: The osx failed https://app.circleci.com/pipelines/github/facebookresearch/faiss/5698/workflows/4e029c32-8d8b-4db7-99e2-8e802aad6653/jobs/32701 Pull Request resolved: facebookresearch#3357 Reviewed By: kuarora Differential Revision: D56039739 Pulled By: junjieqi fbshipit-source-id: dd434a8817148364797eae39c09e0e1e9edbe858
Summary: The osx failed https://app.circleci.com/pipelines/github/facebookresearch/faiss/5698/workflows/4e029c32-8d8b-4db7-99e2-8e802aad6653/jobs/32701 Pull Request resolved: facebookresearch#3357 Reviewed By: kuarora Differential Revision: D56039739 Pulled By: junjieqi fbshipit-source-id: dd434a8817148364797eae39c09e0e1e9edbe858
The osx failed
https://app.circleci.com/pipelines/github/facebookresearch/faiss/5698/workflows/4e029c32-8d8b-4db7-99e2-8e802aad6653/jobs/32701