From 0c948fb0d418a9742b375fe1f011f1a7f231fae0 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 19 Mar 2026 10:28:20 +0000 Subject: [PATCH 01/23] updated v2.5.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 069493b..b7b8baa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "multipers" %} -{% set version = "2.4.1" %} +{% set version = "2.5.0" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: d700ea1f032576fa22e24c3b68524c982a2967c33f47f1a854d76c6ae2262002 + sha256: 5a6c0e7f2825af24c3e743dd4aeea5afc859d70ea7f3705c80d6380cd5d9476d build: script: {{ PYTHON }} -m pip install . -vv From 7cc57dfa4227e4a6276c6b5352bf0e0f8f11f3b0 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 19 Mar 2026 10:28:54 +0000 Subject: [PATCH 02/23] MNT: Re-rendered with conda-smithy 3.57.0 and conda-forge-pinning 2026.03.18.17.42.5 --- .azure-pipelines/azure-pipelines-linux.yml | 73 ------------ .azure-pipelines/azure-pipelines-osx.yml | 12 +- .github/workflows/conda-build.yml | 129 +++++++++++++++++++-- .scripts/build_steps.sh | 1 + LICENSE.txt | 3 +- azure-pipelines.yml | 3 +- build-locally.py | 8 +- 7 files changed, 137 insertions(+), 92 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-linux.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml deleted file mode 100755 index 10fd842..0000000 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ /dev/null @@ -1,73 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: linux - pool: - vmImage: ubuntu-latest - strategy: - matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.12.____cpython: - CONFIG: linux_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.13.____cp313: - CONFIG: linux_64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.14.____cp314: - CONFIG: linux_64_python3.14.____cp314 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - timeoutInMinutes: 360 - variables: {} - - steps: - - script: | - SWAPFILE=/swapfile - # If there is already a swapfile, disable it and remove it - if swapon --show | grep -q $SWAPFILE; then - echo "Disabling existing swapfile..." - sudo swapoff $SWAPFILE || true - fi - [ -f "$SWAPFILE" ] && sudo rm -f $SWAPFILE - sudo fallocate -l 10GiB $SWAPFILE - sudo chmod 600 $SWAPFILE - sudo mkswap $SWAPFILE - sudo swapon $SWAPFILE - displayName: Create swap file - # configure qemu binfmt-misc running. This allows us to run docker containers - # embedded qemu-static - - script: | - docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes - ls /proc/sys/fs/binfmt_misc/ - condition: not(startsWith(variables['CONFIG'], 'linux_64')) - displayName: Configure binfmt_misc - - - script: | - export CI=azure - export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) - export remote_url=$(Build.Repository.Uri) - export sha=$(Build.SourceVersion) - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - .scripts/run_docker_build.sh - displayName: Run docker build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7871044..8bd74f0 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,39 +5,49 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_python3.10.____cpython: CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_64_python3.11.____cpython: CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_64_python3.12.____cpython: CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_64_python3.13.____cp313: CONFIG: osx_64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_64_python3.14.____cp314: CONFIG: osx_64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_python3.11.____cpython: CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_python3.13.____cp313: CONFIG: osx_arm64_python3.13.____cp313 UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_python3.14.____cp314: CONFIG: osx_arm64_python3.14.____cp314 UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 timeoutInMinutes: 360 variables: {} diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index a948c6c..3e1fda7 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -1,15 +1,130 @@ -# This file was added automatically by admin-migrations. Do not modify. -# It ensures that Github Actions can run once rerendered for the first time. +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- name: Build conda package on: - workflow_dispatch: + push: + + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true jobs: build: - name: Disabled build - runs-on: ubuntu-slim - if: false + name: ${{ matrix.CONFIG }} + runs-on: ${{ matrix.runs_on }} + timeout-minutes: 360 + strategy: + fail-fast: false + max-parallel: 50 + matrix: + include: + - CONFIG: linux_64_python3.10.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_python3.11.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_python3.13.____cp313 + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_python3.14.____cp314 + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 steps: - - run: exit 0 + + - name: Checkout code + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + + - name: Build on Linux + id: build-linux + if: matrix.os == 'ubuntu' + env: + CONFIG: ${{ matrix.CONFIG }} + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }} + CI: github_actions + CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}" + BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} + FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} + STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} + shell: bash + run: | + if [[ "$(uname -m)" == "x86_64" ]]; then + echo "::group::Configure binfmt_misc" + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + fi + export flow_run_id="github_$GITHUB_RUN_ID" + export remote_url="https://github.com/$GITHUB_REPOSITORY" + export sha="$GITHUB_SHA" + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export GIT_BRANCH="$(basename $GITHUB_REF)" + if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + echo "::endgroup::" + ./.scripts/run_docker_build.sh + + - name: Build on macOS + id: build-macos + if: matrix.os == 'macos' + env: + CONFIG: ${{ matrix.CONFIG }} + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + CI: github_actions + BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} + FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} + STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} + shell: bash + run: | + export flow_run_id="github_$GITHUB_RUN_ID" + export remote_url="https://github.com/$GITHUB_REPOSITORY" + export sha="$GITHUB_SHA" + export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" + export GIT_BRANCH="$(basename $GITHUB_REF)" + if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + ./.scripts/run_osx_build.sh + + - name: Build on windows + id: build-windows + if: matrix.os == 'windows' + shell: cmd + run: | + set "flow_run_id=github_%GITHUB_RUN_ID%" + set "remote_url=https://github.com/%GITHUB_REPOSITORY%" + set "sha=%GITHUB_SHA%" + call ".scripts\run_win_build.bat" + env: + # default value; make it explicit, as it needs to match with artefact + # generation below. Not configurable for now, can be revisited later + CONDA_BLD_DIR: C:\bld + MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge + PYTHONUNBUFFERED: 1 + CONFIG: ${{ matrix.CONFIG }} + CI: github_actions + UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} + BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} + FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} + STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 780a358..be060cb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -20,6 +20,7 @@ export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export RATTLER_CACHE_DIR="${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache" cat >~/.condarc < Date: Thu, 19 Mar 2026 09:33:04 -0700 Subject: [PATCH 03/23] new build system --- recipe/meta.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b7b8baa..53c27a1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,11 +23,17 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy >=2 # [build_platform != target_platform] - cython >=3 # [build_platform != target_platform] + - python-build + - wheel + - scikit-build-core + - ninja + - cmake >=3.27 host: - python - numpy >=2 - cython >=3 - - setuptools + - python-build + - wheel - pip - tbb - tbb-devel @@ -56,7 +62,7 @@ test: about: home: https://davidlapous.github.io/multipers/ summary: Multiparameter Topological Persistence for Machine Learning - license: MIT + license: GPL-3.0-or-later license_file: LICENSE extra: From 54ca7c35e3d652120c9ba6f72602131379a48ffd Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 09:44:29 -0700 Subject: [PATCH 04/23] pip? --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 53c27a1..f1691dd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy >=2 # [build_platform != target_platform] - cython >=3 # [build_platform != target_platform] + - pip - python-build - wheel - scikit-build-core From ef3ff06e281383bf74d5baf241c4779889c85b15 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 09:55:46 -0700 Subject: [PATCH 05/23] let conda manage env --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f1691dd..27881b9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 5a6c0e7f2825af24c3e743dd4aeea5afc859d70ea7f3705c80d6380cd5d9476d build: - script: {{ PYTHON }} -m pip install . -vv + script: {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 skip: true # [py<=39] From 78a838b8e4776f0fa2c8557cfa4ced941367b683 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 09:58:29 -0700 Subject: [PATCH 06/23] add numpy pin --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 27881b9..4619542 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,7 +42,7 @@ requirements: run: - python - tbb - - numpy + - {{ pin_compatible('numpy') }} - gudhi >=3.8 - tqdm - scipy From e4c8d7bb3c4f0ba580d5b8c57fbd3b3cb45e3444 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:07:34 -0700 Subject: [PATCH 07/23] added some deps --- recipe/meta.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4619542..872f80d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,11 +34,19 @@ requirements: - numpy >=2 - cython >=3 - python-build + - scikit-build-core - wheel - pip - tbb - tbb-devel - libboost-devel + - cgal-cpp + - gmp # [not win] + - mpfr # [not win] + - llvm-openmp # [osx] + - libgomp # [linux] + - intel-openmp # [win] + - eigen run: - python - tbb @@ -50,6 +58,11 @@ requirements: - matplotlib-base - scikit-learn - pot + - libgmp # [win] + - mpfr # [win] + - llvm-openmp # [osx] + - libgomp # [linux] + - intel-openmp # [win] test: From b9dd0e1e369e065ed3ac67d1adcb5b5c5dda8af0 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:18:46 -0700 Subject: [PATCH 08/23] force ninja? --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 872f80d..ebaee6d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 5a6c0e7f2825af24c3e743dd4aeea5afc859d70ea7f3705c80d6380cd5d9476d build: - script: {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps + script: {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" --config-settings=cmake.generator="Ninja" number: 0 skip: true # [py<=39] From 3efcf189ddcb8cf6aebffe5e35bd8c1d9f10fc16 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:26:06 -0700 Subject: [PATCH 09/23] please work --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ebaee6d..1c152f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,9 @@ source: sha256: 5a6c0e7f2825af24c3e743dd4aeea5afc859d70ea7f3705c80d6380cd5d9476d build: - script: {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" --config-settings=cmake.generator="Ninja" + export CMAKE_GENERATOR=Ninja + {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps \ + --config-settings=cmake.args="${CMAKE_ARGS}" number: 0 skip: true # [py<=39] From 6f0d29631668550b6984064a57e7678fe4428aab Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:28:23 -0700 Subject: [PATCH 10/23] . --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1c152f0..1ed608e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,8 +11,7 @@ source: build: export CMAKE_GENERATOR=Ninja - {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps \ - --config-settings=cmake.args="${CMAKE_ARGS}" + {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" number: 0 skip: true # [py<=39] From b2442df66627363eb92c76c4163c11c51134eadc Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:33:32 -0700 Subject: [PATCH 11/23] . --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1ed608e..f300980 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,8 +10,9 @@ source: sha256: 5a6c0e7f2825af24c3e743dd4aeea5afc859d70ea7f3705c80d6380cd5d9476d build: - export CMAKE_GENERATOR=Ninja - {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" + script: | + export CMAKE_GENERATOR=Ninja + {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" number: 0 skip: true # [py<=39] From 733cba01bd204d1c59922effd1b538e59d06da64 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:41:16 -0700 Subject: [PATCH 12/23] multiprocess build --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f300980..3b786e8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,7 @@ source: build: script: | export CMAKE_GENERATOR=Ninja + export CMAKE_BUILD_PARALLEL_LEVEL="$({{ PYTHON }} -c 'import os; print(os.cpu_count() or 1)')" {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" number: 0 skip: true # [py<=39] From cb4a539909ddad59a5673022a9992e5969712ddf Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:42:20 -0700 Subject: [PATCH 13/23] eigen --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3b786e8..30c40e4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,6 +32,7 @@ requirements: - scikit-build-core - ninja - cmake >=3.27 + - eigen host: - python - numpy >=2 @@ -49,7 +50,6 @@ requirements: - llvm-openmp # [osx] - libgomp # [linux] - intel-openmp # [win] - - eigen run: - python - tbb From 8e378e8eeb94f84d69dadb4cce5cc2991d56cac4 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:55:48 -0700 Subject: [PATCH 14/23] bad windows lib --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 30c40e4..a2ebb89 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -61,8 +61,6 @@ requirements: - matplotlib-base - scikit-learn - pot - - libgmp # [win] - - mpfr # [win] - llvm-openmp # [osx] - libgomp # [linux] - intel-openmp # [win] From a6bc1d1f02a19c7a82523d121ad55a227906387e Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 10:56:51 -0700 Subject: [PATCH 15/23] these are available for windows as well --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2ebb89..0999987 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,8 +45,8 @@ requirements: - tbb-devel - libboost-devel - cgal-cpp - - gmp # [not win] - - mpfr # [not win] + - gmp + - mpfr - llvm-openmp # [osx] - libgomp # [linux] - intel-openmp # [win] From 2d5aa04ec185380991bd43d268029fe29dc73042 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 11:17:34 -0700 Subject: [PATCH 16/23] windows stuff --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0999987..47204d0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,9 +11,11 @@ source: build: script: | - export CMAKE_GENERATOR=Ninja - export CMAKE_BUILD_PARALLEL_LEVEL="$({{ PYTHON }} -c 'import os; print(os.cpu_count() or 1)')" - {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps --config-settings=cmake.args="${CMAKE_ARGS}" + export CMAKE_GENERATOR=Ninja # [unix] + export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] + set "CMAKE_GENERATOR=Ninja" # [win] + set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] + {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 skip: true # [py<=39] From 73e9cdc7c402d0284daa1258a2ccfb5041dd6f3b Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 11:30:13 -0700 Subject: [PATCH 17/23] . --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 47204d0..db863a7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,9 +11,7 @@ source: build: script: | - export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] - set "CMAKE_GENERATOR=Ninja" # [win] set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 From 44d862624e6e0fc728d3907f444dd588c4895f94 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 11:44:28 -0700 Subject: [PATCH 18/23] . --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db863a7..a5f6bc9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,6 +11,7 @@ source: build: script: | + export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps From 8a5ca555517b77081dcda7e41d6fb139de266cbc Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 12:19:50 -0700 Subject: [PATCH 19/23] . --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a5f6bc9..16edc23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,9 @@ build: script: | export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] + set "CONDA_PREFIX=%PREFIX%" # [win] set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] + set "CMAKE_ARGS=%CMAKE_ARGS% -DPython3_EXECUTABLE=%PYTHON% -DPython3_ROOT_DIR=%PREFIX% -DPython3_INCLUDE_DIR=%PREFIX%\include -DPython3_LIBRARY=%PREFIX%\libs\python%CONDA_PY%.lib" # [win] {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 skip: true # [py<=39] From 07d45f5988ad8f8659b0ed760f33fd42f2f0a260 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 14:14:31 -0700 Subject: [PATCH 20/23] . --- recipe/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 16edc23..4962ed9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,9 +13,12 @@ build: script: | export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] - set "CONDA_PREFIX=%PREFIX%" # [win] + set "PREFIX_CMAKE=%PREFIX:\=/%" # [win] + set "PYTHON_CMAKE=%PYTHON:\=/%" # [win] + set "SP_DIR_CMAKE=%SP_DIR:\=/%" # [win] + set "CONDA_PREFIX=%PREFIX_CMAKE%" # [win] set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] - set "CMAKE_ARGS=%CMAKE_ARGS% -DPython3_EXECUTABLE=%PYTHON% -DPython3_ROOT_DIR=%PREFIX% -DPython3_INCLUDE_DIR=%PREFIX%\include -DPython3_LIBRARY=%PREFIX%\libs\python%CONDA_PY%.lib" # [win] + set "CMAKE_ARGS=%CMAKE_ARGS% -DPython3_EXECUTABLE=%PYTHON_CMAKE% -DPython3_ROOT_DIR=%PREFIX_CMAKE% -DPython3_INCLUDE_DIR=%PREFIX_CMAKE%/include -DPython3_LIBRARY=%PREFIX_CMAKE%/libs/python%CONDA_PY%.lib -DPython3_NumPy_INCLUDE_DIR=%SP_DIR_CMAKE%/numpy/_core/include" # [win] {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 skip: true # [py<=39] From 3b14b7597c752011184ef7a6b2dd1e12ae95ea75 Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 14:30:53 -0700 Subject: [PATCH 21/23] . --- recipe/meta.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4962ed9..7113b66 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,12 +13,7 @@ build: script: | export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] - set "PREFIX_CMAKE=%PREFIX:\=/%" # [win] - set "PYTHON_CMAKE=%PYTHON:\=/%" # [win] - set "SP_DIR_CMAKE=%SP_DIR:\=/%" # [win] - set "CONDA_PREFIX=%PREFIX_CMAKE%" # [win] set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] - set "CMAKE_ARGS=%CMAKE_ARGS% -DPython3_EXECUTABLE=%PYTHON_CMAKE% -DPython3_ROOT_DIR=%PREFIX_CMAKE% -DPython3_INCLUDE_DIR=%PREFIX_CMAKE%/include -DPython3_LIBRARY=%PREFIX_CMAKE%/libs/python%CONDA_PY%.lib -DPython3_NumPy_INCLUDE_DIR=%SP_DIR_CMAKE%/numpy/_core/include" # [win] {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 skip: true # [py<=39] @@ -32,13 +27,12 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy >=2 # [build_platform != target_platform] - cython >=3 # [build_platform != target_platform] - - pip - - python-build - - wheel - - scikit-build-core + - pip # [build_platform != target_platform] + - python-build # [build_platform != target_platform] + - wheel # [build_platform != target_platform] + - scikit-build-core # [build_platform != target_platform] - ninja - cmake >=3.27 - - eigen host: - python - numpy >=2 @@ -53,6 +47,7 @@ requirements: - cgal-cpp - gmp - mpfr + - eigen - llvm-openmp # [osx] - libgomp # [linux] - intel-openmp # [win] From 5467c26e2ded2c5acd4cb09aea044e588dcb251f Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 14:46:57 -0700 Subject: [PATCH 22/23] . --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7113b66..dfe639c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ build: script: | export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] + set "CONDA_PREFIX=%PREFIX:\=/%" # [win] set "CMAKE_BUILD_PARALLEL_LEVEL=%CPU_COUNT%" # [win] {{ PYTHON }} -m pip install . -vv --no-build-isolation --no-deps number: 0 From 973a726a8e476c70630f8047b8cb0dfb1f4634be Mon Sep 17 00:00:00 2001 From: David Loiseaux Date: Thu, 19 Mar 2026 15:03:32 -0700 Subject: [PATCH 23/23] . --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dfe639c..192a379 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,6 +11,7 @@ source: build: script: | + export CONDA_PREFIX="${PREFIX}" # [unix] export CMAKE_GENERATOR=Ninja # [unix] export CMAKE_BUILD_PARALLEL_LEVEL="${CPU_COUNT}" # [unix] set "CONDA_PREFIX=%PREFIX:\=/%" # [win]