Skip to content

Commit d72d0ca

Browse files
Michael Norrisfacebook-github-bot
authored andcommitted
Fix nightly by installing earlier version of lief (#4198)
Summary: Pull Request resolved: #4198 1. pins lief due to `AttributeError: type object 'CLASS' has no attribute 'CLASS64'` (just set it to last passing nightly version) 2. pins mkl in gpu builds due to it trying to pull in 2024.2.2 which conflicts with 2023 in the libfaiss. Added nightlies to make sure they pass https://github.com/facebookresearch/faiss/actions/runs/13422430425/job/37498020894. Not all passed: I'm not sure the `build-pull-request / Linux x86_64 GPU w/ cuVS nightlies (CUDA 12.4.0)` nightly is actually broken, but this unblocks the PR builds for now. Reviewed By: junjieqi Differential Revision: D69860604 fbshipit-source-id: 2da623c71b03c22d581b78655253a863fbafd3ed
1 parent 657c563 commit d72d0ca

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

.github/actions/build_conda/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ runs:
4444
# Ensure starting packages are from conda-forge.
4545
conda list --show-channel-urls
4646
conda install -y -q "conda!=24.11.0"
47-
conda install -y -q "conda-build!=24.11.0"
47+
conda install -y -q "conda-build!=24.11.0" "liblief=0.14.1"
4848
conda list --show-channel-urls
4949
- name: Enable anaconda uploads
5050
if: inputs.label != ''

conda/faiss-gpu-cuvs/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,13 @@ outputs:
104104
- mkl =2023 # [x86_64]
105105
- cuda-toolkit {{ cudatoolkit }}
106106
host:
107+
- mkl =2023 # [x86_64]
107108
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
108109
- python {{ python }}
109110
- numpy >=1.19,<2
110111
- {{ pin_subpackage('libfaiss', exact=True) }}
111112
run:
113+
- mkl =2023 # [x86_64]
112114
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
113115
- python {{ python }}
114116
- numpy >=1.19,<2

conda/faiss-gpu/meta.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,15 @@ outputs:
8989
- make =4.4 # [osx and arm64]
9090
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64 and not win]
9191
- cuda-toolkit {{ cudatoolkit }}
92+
- mkl-devel =2023.0 # [x86_64]
9293
host:
94+
- mkl =2023.0 # [x86_64]
9395
- python {{ python }}
9496
- numpy >=1.19,<2
9597
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64 and not win]
9698
- {{ pin_subpackage('libfaiss', exact=True) }}
9799
run:
100+
- mkl =2023.0 # [x86_64]
98101
- python {{ python }}
99102
- numpy >=1.19,<2
100103
- packaging

0 commit comments

Comments
 (0)