Skip to content

Commit 181f568

Browse files
ramilbakhshyievabhinavdangeti
authored andcommitted
Unbreak RAFT conda builds (facebookresearch#3519)
Summary: Pull Request resolved: facebookresearch#3519 Fixing the conda conflicts because of `_openmp_mutex` build versions. This change pins that version for RAFT conda package builds. Reviewed By: algoriddle Differential Revision: D58646659 fbshipit-source-id: 4c1eaa9f08bd354da016b9399a36698007a497d8
1 parent f7c2e1a commit 181f568

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

conda/faiss-gpu-raft/meta.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,18 @@ outputs:
5050
- llvm-openmp # [osx]
5151
- cmake >=3.24.0
5252
- make # [not win]
53+
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
54+
- mkl =2023 # [x86_64]
5355
- mkl-devel =2023 # [x86_64]
5456
- cuda-toolkit {{ cudatoolkit }}
5557
host:
58+
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
5659
- mkl =2023 # [x86_64]
5760
- openblas # [not x86_64]
5861
- libraft =24.04
5962
- cuda-version {{ cuda_constraints }}
6063
run:
64+
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
6165
- mkl =2023 # [x86_64]
6266
- openblas # [not x86_64]
6367
- cuda-cudart {{ cuda_constraints }}
@@ -87,12 +91,16 @@ outputs:
8791
- swig
8892
- cmake >=3.24.0
8993
- make # [not win]
94+
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
95+
- mkl =2023 # [x86_64]
9096
- cuda-toolkit {{ cudatoolkit }}
9197
host:
98+
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
9299
- python {{ python }}
93100
- numpy >=1.19,<2
94101
- {{ pin_subpackage('libfaiss', exact=True) }}
95102
run:
103+
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
96104
- python {{ python }}
97105
- numpy >=1.19,<2
98106
- packaging

0 commit comments

Comments
 (0)