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

Jump to bottom

chore: allow building simsearch along with tensorrt + disable python in faiss #1367

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: allow building simsearch along with tensorrt + disable python in faiss #1367

wants to merge 1 commit into from
+6 −6

Conversation

beniz
Copy link
Collaborator

@beniz beniz commented Nov 14, 2021

No description provided.

@beniz beniz self-assigned this Nov 14, 2021
@mergify mergify bot requested review from Bycob and fantes November 14, 2021 13:00
Bycob
Bycob reviewed Nov 15, 2021
View reviewed changes
CMakeLists.txt
@@ -349,7 +349,7 @@ if (USE_CAFFE OR USE_TORCH)
set(FAISS_INCLUDE_DIR ${CMAKE_BINARY_DIR}/faiss/src/faiss)
include_directories("${FAISS_INCLUDE_DIR}")
set(FAISS_LIB_DIR ${CMAKE_BINARY_DIR}/faiss/src/faiss/build/faiss)
set(FAISS_LIB_DEPS openblas faiss)
set(FAISS_LIB_DEPS openblas faiss lmdb)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this related to #1369?

@mergify
Copy link
Contributor

mergify bot commented Nov 16, 2021

This pull request is now in conflict :(

@mergify mergify bot added the conflict label Nov 16, 2021
@mergify mergify bot removed the conflict label Sep 26, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 26, 2022

This pull request is now in conflict :(

@mergify mergify bot added the conflict label Sep 26, 2022
@mergify mergify bot removed the conflict label Mar 16, 2023
@mergify
Copy link
Contributor

mergify bot commented Mar 16, 2023

This pull request is now in conflict :(

@mergify mergify bot added the conflict label Mar 16, 2023
@mergify mergify bot removed the conflict label May 15, 2023
@mergify
Copy link
Contributor

mergify bot commented May 15, 2023

This pull request is now in conflict :(

@mergify mergify bot added the conflict label May 15, 2023
@mergify mergify bot removed the conflict label Jun 30, 2023
@mergify
Copy link
Contributor

mergify bot commented Jun 30, 2023

This pull request is now in conflict :(

@mergify mergify bot added the conflict label Jun 30, 2023
@mergify
Copy link
Contributor

mergify bot commented Sep 5, 2023

This pull request is now in conflict :(

@mergify mergify bot removed the conflict label Jan 8, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 8, 2024

This pull request is now in conflict :(

@mergify mergify bot added the conflict label Jan 8, 2024
@mergify mergify bot requested a review from Bycob March 25, 2024 16:35
@mergify mergify bot requested review from fantes and royale March 25, 2024 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fantes fantes fantes approved these changes

@Bycob Bycob Awaiting requested review from Bycob

@royale royale Awaiting requested review from royale

Assignees

@beniz beniz

Labels
ci:docker conflict mllib:simsearch mllib:tensorrt process:ready-to-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@beniz @Bycob @fantes