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.

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

Bump Faiss commit from 4eecd916 to 1f42e815 #2224

Merged

Conversation

naveentatikonda
Copy link
Member

@naveentatikonda naveentatikonda commented Oct 21, 2024

Description

Bump Faiss commit from 4eecd916 to 1f42e815 to fix the below error while building faiss with avx512.
https://build.ci.opensearch.org/blue/rest/organizations/jenkins/pipelines/distribution-build-opensearch/runs/10431/nodes/82/steps/436/log/?start=0

/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp:405:41: error: could not convert ‘true’ from ‘bool’ to ‘faiss::{anonymous}::QuantizerTemplateScaling’
  405 | struct QuantizerTemplate<Codec, true, 16> : QuantizerTemplate<Codec, true, 1> {
      |                                         ^
/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp:405:77: error: could not convert ‘true’ from ‘bool’ to ‘faiss::{anonymous}::QuantizerTemplateScaling’
  405 | struct QuantizerTemplate<Codec, true, 16> : QuantizerTemplate<Codec, true, 1> {
      |                                                                             ^
/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp:505:42: error: could not convert ‘false’ from ‘bool’ to ‘faiss::{anonymous}::QuantizerTemplateScaling’
  505 | struct QuantizerTemplate<Codec, false, 16>
      |                                          ^
/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp:506:44: error: could not convert ‘false’ from ‘bool’ to ‘faiss::{anonymous}::QuantizerTemplateScaling’
  506 |         : QuantizerTemplate<Codec, false, 1> {
      |                                            ^
/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp: In instantiation of ‘faiss::ScalarQuantizer::SQuantizer* faiss::{anonymous}::select_quantizer_1(faiss::{anonymous}::QuantizerType, size_t, const std::vector<float>&) [with int SIMDWIDTH = 16; faiss::{anonymous}::QuantizerType = faiss::ScalarQuantizer::QuantizerType; size_t = long unsigned int]’:
/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp:2036:56:   required from here
/tmp/tmpe4ej14tb/k-NN/jni/external/faiss/faiss/impl/ScalarQuantizer.cpp:914:20: error: new initializer expression list treated as compound expression [-fpermissive]
  914 |             return new QuantizerTemplate<
      |                    ^~~~~~~~~~~~~~~~~~~~~~
  915 |                     Codec8bit,
      |                     ~~~~~~~~~~
  916 |                     QuantizerTemplateScaling::NON_UNIFORM,
      |                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  917 |                     SIMDWIDTH>(d, trained);
      |                     ~~~~~~~~~~~~~~~~~~~~~~

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@naveentatikonda
Copy link
Member Author

Validated it by building faiss library with AVX512 on a machine with AVX512

@naveentatikonda naveentatikonda merged commit d52ee14 into opensearch-project:main Oct 21, 2024
47 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 21, 2024
Signed-off-by: Naveen Tatikonda <[email protected]>
(cherry picked from commit d52ee14)
@naveentatikonda naveentatikonda deleted the bump_faiss_commit branch October 21, 2024 23:03
naveentatikonda added a commit that referenced this pull request Oct 22, 2024
Signed-off-by: Naveen Tatikonda <[email protected]>
(cherry picked from commit d52ee14)

Co-authored-by: Naveen Tatikonda <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants