From 1a0745518b4386cb3d7dc0553a4de25708ef6645 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 17 Aug 2026 22:30:28 +0000 Subject: [PATCH 1/2] updated v0.3.35 --- recipe/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 1bc9d00..d5dc5e9 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -2,7 +2,7 @@ schema_version: 1 context: name: llama-cpp-python - version: "0.3.34" + version: "0.3.35" # NOTE: VERIFY llama_cpp_version before merging! llama_cpp_version: "9923" @@ -12,13 +12,13 @@ package: source: url: https://pypi.org/packages/source/${{ name[0] }}/${{ name }}/llama_cpp_python-${{ version }}.tar.gz - sha256: d849d286d808284f1d3ec1bd6875572430d29d1f9574a010232caa4e9cef0e35 + sha256: 1139dbb54509074b70893fab8554e3b079aa9f4d312058ce4018ef0019e3de12 patches: # Asks cdll to look for the library in the path as well. - 0001-Adapt-shared-library-relocation.patch build: - number: 1 + number: 0 script: - if: win then: From 189772ad1f4cf76aa61a650f705dc4ad8709f0ea Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 17 Aug 2026 22:30:50 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 2026.8.9 and conda-forge-pinning 2026.08.17.07.23.3 --- .azure-pipelines/azure-pipelines-osx.yml | 0 .azure-pipelines/azure-pipelines-win.yml | 77 ---------------- .../linux_64_python3.10.____cpython.yaml | 4 +- .../linux_64_python3.11.____cpython.yaml | 4 +- .../linux_64_python3.12.____cpython.yaml | 4 +- .../linux_64_python3.13.____cp313.yaml | 4 +- .../linux_64_python3.14.____cp314.yaml | 4 +- .../linux_aarch64_python3.10.____cpython.yaml | 4 +- .../linux_aarch64_python3.11.____cpython.yaml | 4 +- .../linux_aarch64_python3.12.____cpython.yaml | 4 +- .../linux_aarch64_python3.13.____cp313.yaml | 4 +- .../linux_aarch64_python3.14.____cp314.yaml | 4 +- .../osx_64_python3.10.____cpython.yaml | 4 +- .../osx_64_python3.11.____cpython.yaml | 4 +- .../osx_64_python3.12.____cpython.yaml | 4 +- .ci_support/osx_64_python3.13.____cp313.yaml | 4 +- .ci_support/osx_64_python3.14.____cp314.yaml | 4 +- .../osx_arm64_python3.10.____cpython.yaml | 4 +- .../osx_arm64_python3.11.____cpython.yaml | 4 +- .../osx_arm64_python3.12.____cpython.yaml | 4 +- .../osx_arm64_python3.13.____cp313.yaml | 4 +- .../osx_arm64_python3.14.____cp314.yaml | 4 +- .github/workflows/conda-build.yml | 67 +++++++++++++- .scripts/build_steps.sh | 2 + .scripts/logging_utils.sh | 0 .scripts/run_osx_build.sh | 2 + .scripts/run_win_build.bat | 4 +- README.md | 89 ++++++++++--------- azure-pipelines.yml | 3 +- 29 files changed, 160 insertions(+), 164 deletions(-) mode change 100755 => 100644 .azure-pipelines/azure-pipelines-osx.yml delete mode 100755 .azure-pipelines/azure-pipelines-win.yml mode change 100644 => 100755 .scripts/logging_utils.sh diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml old mode 100755 new mode 100644 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 44162db..0000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,77 +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: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: false - tools_install_dir: D:\Miniforge - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: false - tools_install_dir: D:\Miniforge - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: false - tools_install_dir: D:\Miniforge - win_64_python3.13.____cp313: - CONFIG: win_64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: false - tools_install_dir: D:\Miniforge - win_64_python3.14.____cp314: - CONFIG: win_64_python3.14.____cp314 - UPLOAD_PACKAGES: 'True' - build_workspace_dir: D:\\bld\\ - free_disk_space: skip - pagefile_size: 0 - resize_partitions: false - store_build_artifacts: false - tools_install_dir: D:\Miniforge - timeoutInMinutes: 360 - variables: - UPLOAD_TEMP: D:\\tmp - - steps: - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - CI: azure - CONFIG: $(CONFIG) - CONDA_BLD_PATH: $(build_workspace_dir) - MINIFORGE_HOME: $(tools_install_dir) - PYTHONUNBUFFERED: 1 - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 001720f..3912880 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 7d0abda..8e57eae 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 9389521..80c1b15 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml index aa003a7..ef5c6f9 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_64_python3.14.____cp314.yaml b/.ci_support/linux_64_python3.14.____cp314.yaml index 7c6cd1f..2dc3d78 100644 --- a/.ci_support/linux_64_python3.14.____cp314.yaml +++ b/.ci_support/linux_64_python3.14.____cp314.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 705acec..0ed0e75 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index da89ea3..6e26541 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index ae5be78..ec607d8 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml index e4d5be1..1ceceae 100644 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_python3.14.____cp314.yaml b/.ci_support/linux_aarch64_python3.14.____cp314.yaml index b65e075..77765ff 100644 --- a/.ci_support/linux_aarch64_python3.14.____cp314.yaml +++ b/.ci_support/linux_aarch64_python3.14.____cp314.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '14' +- '15' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '15' docker_image: - quay.io/condaforge/linux-anvil-aarch64:alma10 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 3179197..0cc521f 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 754f99e..d1e3a03 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index bfcf412..6398c11 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 511b747..70515d7 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.14.____cp314.yaml b/.ci_support/osx_64_python3.14.____cp314.yaml index 184ba00..f67f313 100644 --- a/.ci_support/osx_64_python3.14.____cp314.yaml +++ b/.ci_support/osx_64_python3.14.____cp314.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 75554ff..dffc0fa 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 2106e22..caa176c 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index a1cfbbb..b45b6a5 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index 125ea02..5ae3987 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.14.____cp314.yaml b/.ci_support/osx_arm64_python3.14.____cp314.yaml index 716d4c5..a4748ac 100644 --- a/.ci_support/osx_arm64_python3.14.____cp314.yaml +++ b/.ci_support/osx_arm64_python3.14.____cp314.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '19' +- '21' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '19' +- '21' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 5725603..35a1e96 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -142,10 +142,70 @@ jobs: resize_partitions: False runs_on: ['ubuntu-24.04-arm'] tools_install_dir: ~/miniforge3 + - CONFIG: win_64_python3.10.____cpython + STORE_BUILD_ARTIFACTS: False + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_64_python3.11.____cpython + STORE_BUILD_ARTIFACTS: False + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_64_python3.12.____cpython + STORE_BUILD_ARTIFACTS: False + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_64_python3.13.____cp313 + STORE_BUILD_ARTIFACTS: False + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge + - CONFIG: win_64_python3.14.____cp314 + STORE_BUILD_ARTIFACTS: False + UPLOAD_PACKAGES: True + build_platform: win-64 + build_workspace_dir: D:\\bld\\ + docker_run_args: + free_disk_space: skip + os: windows + pagefile_size: 0 + resize_partitions: False + runs_on: ['windows-2022'] + tools_install_dir: D:\Miniforge steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Configure binfmt_misc if: matrix.os == 'ubuntu' shell: bash @@ -174,7 +234,7 @@ jobs: run: | export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" + export GIT_BRANCH="${GITHUB_REF_NAME}" export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" export flow_run_id="github_$GITHUB_RUN_ID" export remote_url="https://github.com/$GITHUB_REPOSITORY" @@ -204,7 +264,7 @@ jobs: run: | export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}" export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" + export GIT_BRANCH="${GITHUB_REF_NAME}" export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}" export flow_run_id="github_$GITHUB_RUN_ID" export remote_url="https://github.com/$GITHUB_REPOSITORY" @@ -226,6 +286,7 @@ jobs: set "sha=%GITHUB_SHA%" call ".scripts\run_win_build.bat" env: + BUILD_PLATFORM: ${{ matrix.build_platform }} CI: github_actions CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }} CONFIG: ${{ matrix.CONFIG }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5a9998..56dc0fe 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -73,6 +73,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ ${BUILD_OUTPUT_ID:+--output-name "${BUILD_OUTPUT_ID}"} \ + --build-platform "${BUILD_PLATFORM}" \ --target-platform "${HOST_PLATFORM}" rattler-build debug shell @@ -88,6 +89,7 @@ else --recipe "${RECIPE_ROOT}" \ -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ + --build-platform "${BUILD_PLATFORM}" \ --target-platform "${HOST_PLATFORM}" \ --extra-meta flow_run_id="${flow_run_id:-}" \ --extra-meta remote_url="${remote_url:-}" \ diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh old mode 100644 new mode 100755 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 18a7c7f..400a3a0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -98,6 +98,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then rattler-build debug setup \ --recipe ./recipe \ -m ./.ci_support/${CONFIG}.yaml \ + --build-platform "${BUILD_PLATFORM}" \ --target-platform "${HOST_PLATFORM}" \ ${BUILD_OUTPUT_ID:+--output-name "${BUILD_OUTPUT_ID}"} \ ${EXTRA_CB_OPTIONS:-} @@ -112,6 +113,7 @@ else rattler-build build --recipe ./recipe \ -m ./.ci_support/${CONFIG}.yaml \ ${EXTRA_CB_OPTIONS:-} \ + --build-platform "${BUILD_PLATFORM}" \ --target-platform "${HOST_PLATFORM}" \ --extra-meta flow_run_id="$flow_run_id" \ --extra-meta remote_url="$remote_url" \ diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 8d64121..a3da73e 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -76,7 +76,7 @@ call :end_group :: Build the recipe echo Building recipe -rattler-build.exe build --recipe "recipe" -m .ci_support\%CONFIG%.yaml %EXTRA_CB_OPTIONS% --target-platform %HOST_PLATFORM% +rattler-build.exe build --recipe "recipe" -m .ci_support\%CONFIG%.yaml %EXTRA_CB_OPTIONS% --build-platform %BUILD_PLATFORM% --target-platform %HOST_PLATFORM% if !errorlevel! neq 0 exit /b !errorlevel! call :start_group "Inspecting artifacts" @@ -87,7 +87,7 @@ call :end_group :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" - set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + set "GIT_BRANCH=%GITHUB_REF_NAME%" if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( set "IS_PR_BUILD=True" ) else ( diff --git a/README.md b/README.md index 836fadc..5f0cb60 100644 --- a/README.md +++ b/README.md @@ -68,41 +68,6 @@ Current build status variant - - win_64_python3.10.____cpython - - - variant - - - - win_64_python3.11.____cpython - - - variant - - - - win_64_python3.12.____cpython - - - variant - - - - win_64_python3.13.____cp313 - - - variant - - - - win_64_python3.14.____cp314 - - - variant - - @@ -128,31 +93,73 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `llama-cpp-python` can be installed with `conda`: +How to use +---------- + +
+With conda ``` conda install llama-cpp-python ``` -or with `mamba`: +
+ +
+With mamba ``` mamba install llama-cpp-python ``` -It is possible to list all of the versions of `llama-cpp-python` available on your platform with `conda`: +
+ +
+With pixi + +``` +# for adding to your local project +pixi add llama-cpp-python +# for installing globally +pixi global install llama-cpp-python +``` + +
+ +Search package versions +----------------------- + +It is possible to list all of the versions of `llama-cpp-python` available on your platform: + +
+With conda ``` conda search llama-cpp-python --channel conda-forge ``` -or with `mamba`: +
+ +
+With mamba ``` mamba search llama-cpp-python --channel conda-forge ``` -Alternatively, `mamba repoquery` may provide more information: +
+ +
+With pixi + +``` +pixi search llama-cpp-python --channel conda-forge +``` + +
+ +
+With mamba repoquery, which may provide more information ``` # Search all versions available on your platform: @@ -165,6 +172,8 @@ mamba repoquery whoneeds llama-cpp-python --channel conda-forge mamba repoquery depends llama-cpp-python --channel conda-forge ``` +
+ About conda-forge ================= diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 03594e4..7e0f633 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,5 +28,4 @@ stages: condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) dependsOn: Check jobs: - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file