From 5cc2d7985eb9f041351b36dff8c0f2cf94d2a43c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 12 Aug 2025 19:04:53 +0000 Subject: [PATCH 1/2] updated v1.12.0 --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 499385f5..6b62e119 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.9.0" %} +{% set version = "1.12.0" %} # see github.com/conda-forge/conda-forge.github.io/issues/1059 for naming discussion {% set faiss_proc_type = "cuda" if cuda_compiler_version != "None" else "cpu" %} @@ -41,7 +41,7 @@ package: source: url: https://github.com/facebookresearch/faiss/archive/v{{ version }}.tar.gz - sha256: f6721f1a479b0bdd8547e5bb0dbfa872643e7ea37686c6bf6fc99fb933b3fe4f + sha256: 561376d1a44771bf1230fabeef9c81643468009b45a585382cf38d3a7a94990a patches: - patches/0001-adapt-header-target-directory-to-outputname.patch # patch for avoiding crash in GPU test suite on windows @@ -88,10 +88,10 @@ outputs: - exit 0 - name: libfaiss - script: build-lib.sh # [unix] - script: build-lib.bat # [win] + script: build-lib.sh # [unix] + script: build-lib.bat # [win] build: - string: "h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ faiss_proc_type }}" # [cuda_compiler_version == "None"] + string: "h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ faiss_proc_type }}" # [cuda_compiler_version == "None"] string: "cuda{{ cuda_compiler_version | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ faiss_proc_type }}" # [cuda_compiler_version != "None"] run_exports: # faiss follows SemVer, so restrict packages built with libfaiss to use @@ -156,10 +156,10 @@ outputs: - if not exist %LIBRARY_LIB%\cmake\faiss\faiss-targets.cmake exit 1 # [win] - name: faiss - script: build-pkg.sh # [not win] - script: build-pkg.bat # [win] + script: build-pkg.sh # [not win] + script: build-pkg.bat # [win] build: - string: "py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ faiss_proc_type }}" # [cuda_compiler_version == "None"] + string: "py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ faiss_proc_type }}" # [cuda_compiler_version == "None"] string: "py{{ CONDA_PY }}cuda{{ cuda_compiler_version | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ faiss_proc_type }}" # [cuda_compiler_version != "None"] requirements: build: From 2da4d5c702dc4c947ce21e849fb2dea5f9b25b85 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 12 Aug 2025 19:07:12 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 25.7.0, conda-smithy 3.51.1, and conda-forge-pinning 2025.08.12.18.45.16 --- .azure-pipelines/azure-pipelines-linux.yml | 38 ++++-------- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 13 ++-- ...er_version12.6cxx_compiler_version13.yaml} | 13 +--- ...er_versionNonecxx_compiler_version14.yaml} | 17 ++---- ...ler_version11.8cxx_compiler_version11.yaml | 47 --------------- ...er_version12.6cxx_compiler_version13.yaml} | 13 +--- ...er_versionNonecxx_compiler_version14.yaml} | 17 ++---- ...ler_version11.8cxx_compiler_version11.yaml | 47 --------------- ...er_version12.4cxx_compiler_version12.yaml} | 13 +--- ...er_versionNonecxx_compiler_version14.yaml} | 17 ++---- ...ler_version11.8cxx_compiler_version11.yaml | 47 --------------- .ci_support/osx_64_.yaml | 14 ++--- .ci_support/osx_arm64_.yaml | 14 ++--- ... => win_64_cuda_compiler_version12.6.yaml} | 16 ++--- ... => win_64_cuda_compiler_versionNone.yaml} | 18 ++---- ...compilernvcccuda_compiler_version11.8.yaml | 37 ------------ .gitattributes | 1 + .gitignore | 5 ++ .scripts/build_steps.sh | 2 +- .scripts/run_docker_build.sh | 4 +- .scripts/run_osx_build.sh | 2 +- .scripts/run_win_build.bat | 4 +- README.md | 60 +++++-------------- build-locally.py | 55 ++++++++++------- 25 files changed, 123 insertions(+), 393 deletions(-) rename .ci_support/{linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml => linux_64_cuda_compiler_version12.6cxx_compiler_version13.yaml} (82%) rename .ci_support/{linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml => linux_64_cuda_compiler_versionNonecxx_compiler_version14.yaml} (80%) delete mode 100644 .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename .ci_support/{linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml => linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13.yaml} (82%) rename .ci_support/{linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml => linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14.yaml} (80%) delete mode 100644 .ci_support/linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename .ci_support/{linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml => linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml} (82%) rename .ci_support/{linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml => linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml} (80%) delete mode 100644 .ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename .ci_support/{win_64_cuda_compilercuda-nvcccuda_compiler_version12.6.yaml => win_64_cuda_compiler_version12.6.yaml} (70%) rename .ci_support/{win_64_cuda_compilerNonecuda_compiler_versionNone.yaml => win_64_cuda_compiler_versionNone.yaml} (68%) delete mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index db63e416..b1fc3fe8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,42 +8,30 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + linux_64_cuda_compiler_version12.6cxx_compiler_version13: + CONFIG: linux_64_cuda_compiler_version12.6cxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13: - CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13 + linux_64_cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13: + CONFIG: linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13: - CONFIG: linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13 + linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 - linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13: - CONFIG: linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12: + CONFIG: linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12: - CONFIG: linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12 + linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 timeoutInMinutes: 360 variables: {} @@ -94,4 +82,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ac0bf384..cde77002 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -37,4 +37,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 23631b50..3b971a5e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version12.6: + CONFIG: win_64_cuda_compiler_version12.6 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilercuda-nvcccuda_compiler_version12.6: - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.6 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -41,4 +38,4 @@ jobs: UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml b/.ci_support/linux_64_cuda_compiler_version12.6cxx_compiler_version13.yaml similarity index 82% rename from .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml rename to .ci_support/linux_64_cuda_compiler_version12.6cxx_compiler_version13.yaml index add71196..494fb426 100644 --- a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml +++ b/.ci_support/linux_64_cuda_compiler_version12.6cxx_compiler_version13.yaml @@ -19,14 +19,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -40,8 +37,4 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version - - cuda_compiler - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 80% rename from .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version14.yaml index c47769a8..dec950ed 100644 --- a/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -9,24 +9,21 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '13' +- '14' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -40,8 +37,4 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version - - cuda_compiler - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml deleted file mode 100644 index e023753f..00000000 --- a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -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: -- linux-64 -zip_keys: -- - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml b/.ci_support/linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13.yaml similarity index 82% rename from .ci_support/linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13.yaml index 5dc54573..008f802c 100644 --- a/.ci_support/linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13.yaml @@ -19,14 +19,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -40,8 +37,4 @@ target_platform: - linux-aarch64 zip_keys: - - cxx_compiler_version - - cuda_compiler - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 80% rename from .ci_support/linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14.yaml index cd8ec42b..73902da2 100644 --- a/.ci_support/linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -9,24 +9,21 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '13' +- '14' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -40,8 +37,4 @@ target_platform: - linux-aarch64 zip_keys: - - cxx_compiler_version - - cuda_compiler - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml deleted file mode 100644 index 317801ec..00000000 --- a/.ci_support/linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -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: -- linux-aarch64 -zip_keys: -- - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml similarity index 82% rename from .ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml index 2d17bf0a..a1fb47fb 100644 --- a/.ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml @@ -19,14 +19,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -40,8 +37,4 @@ target_platform: - linux-ppc64le zip_keys: - - cxx_compiler_version - - cuda_compiler - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 80% rename from .ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml index deafcd05..070dc18d 100644 --- a/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -9,24 +9,21 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cxx_compiler: - gxx cxx_compiler_version: -- '13' +- '14' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -40,8 +37,4 @@ target_platform: - linux-ppc64le zip_keys: - - cxx_compiler_version - - cuda_compiler - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml deleted file mode 100644 index bb99c355..00000000 --- a/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -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: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ea58fde6..4efa8d32 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,22 +11,19 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '19' llvm_openmp: -- '18' +- '19' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -38,6 +35,3 @@ python: - 3.9.* *_cpython target_platform: - osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 95796780..2773c034 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -11,22 +11,19 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '19' llvm_openmp: -- '18' +- '19' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -38,6 +35,3 @@ python: - 3.9.* *_cpython target_platform: - osx-arm64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.6.yaml b/.ci_support/win_64_cuda_compiler_version12.6.yaml similarity index 70% rename from .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.6.yaml rename to .ci_support/win_64_cuda_compiler_version12.6.yaml index a623002a..126d23fa 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.6.yaml +++ b/.ci_support/win_64_cuda_compiler_version12.6.yaml @@ -9,16 +9,13 @@ cuda_compiler: cuda_compiler_version: - '12.6' cxx_compiler: -- vs2019 +- vs2022 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -30,8 +27,3 @@ python: - 3.9.* *_cpython target_platform: - win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version -- - python - - numpy diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml similarity index 68% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compiler_versionNone.yaml index ded8eb42..cf898fd1 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -5,20 +5,17 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- None +- cuda-nvcc cuda_compiler_version: - None cxx_compiler: -- vs2019 +- vs2022 libblas: -- 3.9 *netlib +- 3.9.* *netlib liblapack: -- 3.9 *netlib +- 3.9.* *netlib numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' +- '2' pin_run_as_build: python: min_pin: x.x @@ -30,8 +27,3 @@ python: - 3.9.* *_cpython target_platform: - win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version -- - python - - numpy diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml deleted file mode 100644 index 45a6b718..00000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- vs2019 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -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: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version -- - python - - numpy diff --git a/.gitattributes b/.gitattributes index 18f114a1..85ccb8f4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,4 +24,5 @@ bld.bat text eol=crlf /README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true +pixi.toml linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index 179afe55..47b5408a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,8 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output +# Pixi's configuration +.pixi diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 827a29fb..780a358f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -97,4 +97,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 00f377a8..b63b5a05 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -12,7 +12,7 @@ source .scripts/logging_utils.sh set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" +PROVIDER_DIR="$(basename "$THISDIR")" FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" @@ -111,4 +111,4 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file +( endgroup "Final checks" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0e3c3942..361edeb2 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -117,4 +117,4 @@ else fi ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file +fi diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 283e1438..27c552b1 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -25,7 +25,7 @@ set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" echo Downloading micromamba %MICROMAMBA_VERSION% if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" -certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +powershell -ExecutionPolicy Bypass -Command "(New-Object Net.WebClient).DownloadFile('%MICROMAMBA_URL%', '%MICROMAMBA_EXE%')" if !errorlevel! neq 0 exit /b !errorlevel! echo Creating environment @@ -148,4 +148,4 @@ if /i "%CI%" == "azure" ( echo ##[endgroup] exit /b ) -exit /b \ No newline at end of file +exit /b diff --git a/README.md b/README.md index 66141276..859bf410 100644 --- a/README.md +++ b/README.md @@ -44,66 +44,45 @@ Current build status - + - + - + - + - + - + - - - - - - - - - @@ -121,24 +100,17 @@ Current build status - - - - + - + diff --git a/build-locally.py b/build-locally.py index c4a56c66..9dfe4403 100755 --- a/build-locally.py +++ b/build-locally.py @@ -10,6 +10,7 @@ import os import platform import subprocess +import sys from argparse import ArgumentParser @@ -44,10 +45,19 @@ def run_osx_build(ns): subprocess.check_call([script]) +def run_win_build(ns): + script = ".scripts/run_win_build.bat" + subprocess.check_call(["cmd", "/D", "/Q", "/C", f"CALL {script}"]) + + def verify_config(ns): + choices_filter = ns.filter or "*" valid_configs = { - os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + os.path.basename(f)[:-5] + for f in glob.glob(f".ci_support/{choices_filter}.yaml") } + if choices_filter != "*": + print(f"filtering for '{choices_filter}.yaml' configs") print(f"valid configs are {valid_configs}") if ns.config in valid_configs: print("Using " + ns.config + " configuration") @@ -60,38 +70,43 @@ def verify_config(ns): selections = list(enumerate(sorted(valid_configs), 1)) for i, c in selections: print(f"{i}. {c}") - s = input("\n> ") + try: + s = input("\n> ") + except KeyboardInterrupt: + print("\nno option selected, bye!", file=sys.stderr) + sys.exit(1) idx = int(s) - 1 ns.config = selections[idx][1] print(f"selected {ns.config}") else: raise ValueError("config " + ns.config + " is not valid") - # Remove the following, as implemented - if ns.config.startswith("win"): - raise ValueError( - f"only Linux/macOS configs currently supported, got {ns.config}" + if ( + ns.config.startswith("osx") + and platform.system() == "Darwin" + and not os.environ.get("OSX_SDK_DIR") + ): + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) - elif ns.config.startswith("osx"): - if "OSX_SDK_DIR" not in os.environ: - raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " - "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " - "Note: OSX_SDK_DIR must be set to an absolute path. " - "Setting this variable implies agreement to the licensing terms of the SDK by Apple." - ) def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--filter", + default=None, + help="Glob string to filter which build choices are presented in interactive mode.", + ) p.add_argument( "--debug", action="store_true", help="Setup debug environment using `conda debug`", ) - p.add_argument( - "--output-id", help="If running debug, specify the output to setup." - ) + p.add_argument("--output-id", help="If running debug, specify the output to setup.") ns = p.parse_args(args=args) verify_config(ns) @@ -104,10 +119,10 @@ def main(args=None): run_docker_build(ns) elif ns.config.startswith("osx"): run_osx_build(ns) + elif ns.config.startswith("win"): + run_win_build(ns) finally: - recipe_license_file = os.path.join( - "recipe", "recipe-scripts-license.txt" - ) + recipe_license_file = os.path.join("recipe", "recipe-scripts-license.txt") if os.path.exists(recipe_license_file): os.remove(recipe_license_file)
VariantStatus
linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13linux_64_cuda_compiler_version12.6cxx_compiler_version13 - variant + variant
linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13linux_64_cuda_compiler_versionNonecxx_compiler_version14 - variant + variant
linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_aarch64_cuda_compiler_version12.6cxx_compiler_version13 - variant + variant
linux_aarch64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13linux_aarch64_cuda_compiler_versionNonecxx_compiler_version14 - variant + variant
linux_aarch64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12 - variant + variant
linux_aarch64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14 - variant - -
linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 - - variant - -
linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.4cxx_compiler_version12 - - variant - -
linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - - variant + variant
win_64_cuda_compilerNonecuda_compiler_versionNone - - variant - -
win_64_cuda_compilercuda-nvcccuda_compiler_version12.6win_64_cuda_compiler_version12.6 - variant + variant
win_64_cuda_compilernvcccuda_compiler_version11.8win_64_cuda_compiler_versionNone - variant + variant