Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9888322
updated v1.10.0
regro-cf-autotick-bot Jan 31, 2025
53a2065
MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and co…
regro-cf-autotick-bot Jan 31, 2025
05b7e32
rebase patches
h-vetinari Jan 31, 2025
b8c2f1b
also build faiss_example_external_module
h-vetinari Jan 31, 2025
4a41d69
MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.47.0, and co…
Mar 25, 2025
b57f4da
Update recipe/meta.yaml
hmaarrfk Mar 25, 2025
ce28bde
add mkl/generic builds
hmaarrfk Mar 25, 2025
0a15f92
build mkl/non-mkl variants
hmaarrfk Mar 25, 2025
fc981fe
MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.47.0, and co…
Mar 25, 2025
edcf74c
remote test.
hmaarrfk Mar 25, 2025
0abaad3
MNT: Re-rendered with conda-smithy 3.56.3 and conda-forge-pinning 202…
weiji14 Mar 15, 2026
ac23e51
Remove CUDA 11.8 skip
weiji14 Mar 15, 2026
5fda235
Set Python_NumPy_INCLUDE_DIR to $SP_DIR/numpy/_core/include for NumPy 2
weiji14 Mar 15, 2026
5a2e6a2
Skip tests failing on NumPy 2
weiji14 Mar 16, 2026
68d0c28
Merge branch 'main' into 1.10.0_hb2f3eb
weiji14 Mar 16, 2026
77c8d6a
Update doc_url to https://faiss.ai/
weiji14 Mar 16, 2026
30cfa03
Tidy up BLAS and OpenMP variant handling
weiji14 Mar 16, 2026
fd33e44
MNT: Re-rendered with conda-smithy 3.56.3 and conda-forge-pinning 202…
weiji14 Mar 16, 2026
54dcc59
More blas and openmp cleanups
weiji14 Mar 16, 2026
2379e0e
Remove conda_build_config.yaml with blas_impl settings
weiji14 Mar 16, 2026
34899b4
MNT: Re-rendered with conda-smithy 3.56.3 and conda-forge-pinning 202…
weiji14 Mar 16, 2026
9661464
Skip some more tests on Windows
weiji14 Mar 16, 2026
4c6d820
Replace libblas, libcblas, liblapack, mkl-devel, etc with blas-devel
weiji14 Mar 16, 2026
e2b2d63
MNT: Re-rendered with conda-smithy 3.56.3 and conda-forge-pinning 202…
weiji14 Mar 16, 2026
198d79b
Set proper build regex with blas_impl for blas-devel
weiji14 Mar 16, 2026
86736f0
Set FAISS_ENABLE_GPU env variable properly
weiji14 Mar 17, 2026
2c551c4
Skip windows CUDA builds
weiji14 Mar 17, 2026
e5a67ae
MNT: Re-rendered with conda-smithy 3.56.3 and conda-forge-pinning 202…
weiji14 Mar 17, 2026
a4b76f1
Skip some more tests on win and osx
weiji14 Mar 17, 2026
ff7670f
Don't build faiss_example_external_module
weiji14 Mar 17, 2026
644aa82
Add intel-openmp for win + mkl build
weiji14 Mar 17, 2026
7fade5d
Revert "Don't build faiss_example_external_module"
weiji14 Mar 17, 2026
81d61b8
Remove win selector on libcublas-dev
weiji14 Mar 17, 2026
05e92b5
Temporarily build for CUDA_ARCH 86 only
weiji14 Mar 17, 2026
b163646
Skip tests that segfault on Linux + CUDA or Windows + MKL
weiji14 Mar 17, 2026
83e87d3
Merge branch 'main' into 1.10.0_hb2f3eb
weiji14 Mar 17, 2026
e4262a9
lint
weiji14 Mar 17, 2026
d1add10
Prefix proc_type and include blas_impl in build string
weiji14 Mar 18, 2026
7426174
Skip more segfaulting tests on linux and windows
weiji14 Mar 18, 2026
24a0c39
Move intel-openmp to libfaiss's host deps
weiji14 Mar 18, 2026
428a985
Comment out test skips under windows + mkl + no cuda
weiji14 Mar 18, 2026
182b4f2
Try using _openmp_mutex instead of llvm-openmp or intel-openmp
weiji14 Mar 18, 2026
b902b2c
Just use llvm-openmp for all platforms
weiji14 Mar 18, 2026
5c11583
Use llvm-openmp for osx and linux, libgomp for win
weiji14 Mar 19, 2026
d478021
Revert back to intel-openmp on win+mkl and reinstate test skips
weiji14 Mar 19, 2026
ea7d0a3
Skip WIndows + MKL builds for now
weiji14 Mar 19, 2026
cb670b4
MNT: Re-rendered with conda-smithy 3.57.0 and conda-forge-pinning 202…
weiji14 Mar 19, 2026
482ebfb
Revert "Temporarily build for CUDA_ARCH 86 only"
weiji14 Mar 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- generic
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -9,19 +11,23 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- '11.8'
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- generic
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -9,19 +11,23 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- cuda-nvcc
cuda_compiler_version:
- '11.8'
- '12.6'
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand All @@ -37,7 +43,7 @@ python:
- 3.12.* *_cpython
- 3.9.* *_cpython
target_platform:
- linux-aarch64
- linux-64
zip_keys:
- - cxx_compiler_version
- cuda_compiler
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- mkl
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,9 +21,13 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- mkl
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,9 +21,13 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- generic
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,9 +21,13 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- generic
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,9 +21,13 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- generic
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,9 +21,13 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
blas_impl:
- generic
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,9 +21,13 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
libblas:
- 3.9 *netlib
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9 *netlib
- 3.9.* *netlib
mkl:
- '2024'
numpy:
- '1.22'
- '1.23'
Expand Down

This file was deleted.

53 changes: 53 additions & 0 deletions .ci_support/osx_64_blas_implgeneric.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
blas_impl:
- generic
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- None
cuda_compiler_version:
- None
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
libblas:
- 3.9.* *netlib
libcblas:
- 3.9.* *netlib
liblapack:
- 3.9.* *netlib
llvm_openmp:
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
mkl:
- '2023'
numpy:
- '1.22'
- '1.23'
- '1.26'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
- 3.9.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
Loading