Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
outputs:
matrix: ${{ steps.process-diff.outputs.matrix }}
steps:
- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
- run: pkgx --sync
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
APPLE_IDENTITY: ${{ github.repository == 'pkgxdev/pantry' && secrets.APPLE_IDENTITY || '-' }}

- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
with:
PKGX_DIR: /opt
- run: pkgx --sync
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pkg-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
APPLE_IDENTITY: ${{ secrets.APPLE_IDENTITY }}

- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
with:
PKGX_DIR: /opt
- run: pkgx --sync
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
pacman -Sy --noconfirm archlinux-keyring
fi
- uses: ./.github/actions/setup
- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
- run: pkgx --sync

- uses: pkgxdev/brewkit/download-build-artifact@v1
Expand All @@ -146,7 +146,7 @@ jobs:
AWS: ${{ inputs.dry-run && 'echo' || 'aws' }}
PREFIX: ${{ needs.build.outputs.project }}/${{ needs.build.outputs.platform }}/${{ needs.build.outputs.arch }}/v${{ needs.build.outputs.version }}.tar.${{ matrix.compression }}
steps:
- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
- run: pkgx --sync

- uses: actions/checkout@v4
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
- run: pkgx --sync

- name: generate versions.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix: ${{ steps.matrix.outputs.matrix }}
pkg: ${{ steps.id.outputs.pkg-json }}
steps:
- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
- run: pkgx --sync
- uses: actions/checkout@v4
- run: .github/scripts/get-matrix.ts ${{ inputs.pkg }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/restock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
outputs:
versions: ${{ steps.inventory.outputs.versions }}
steps:
- uses: pkgxdev/setup@v2
- uses: pkgxdev/setup@v4
- run: pkgx --sync
- uses: actions/checkout@v4
- run: ./.github/scripts/inventory.ts ${{ inputs.project }}
Expand Down
21 changes: 10 additions & 11 deletions projects/github.com/ggerganov/llama.cpp/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,20 @@ platforms:
# Illegal instruction: 4 on darwin/x86-64

dependencies:
pkgx.sh: ^1
pkgx.sh: ">=1"
curl.se: 8 # libcurl, since b5064
linux:
gnu.org/gcc/libstdcxx: '*' # clang doesn't provide omp.h, and we need libstdc++
gnu.org/gcc/libstdcxx: 14 # clang doesn't provide omp.h, and we need libstdc++
gnu.org/gcc: 14 # needs libgomp.so.1

build:
dependencies:
gnu.org/coreutils: '*'
git-scm.org: '*'
gnu.org/coreutils: "*"
git-scm.org: "*"
python.org: ~3.11
cmake.org: 3
linux:
gnu.org/gcc: '*'
linux/aarch64:
kernel.org/linux-headers: '*' # hwcap.h
kernel.org/linux-headers: "*" # hwcap.h
env:
VIRTUAL_ENV: ${{prefix}}/venv
script:
Expand All @@ -43,7 +42,7 @@ build:

# this commit breaks linux/aarch64 - fixed in 1732
- run: curl -LSs 'https://github.com/ggerganov/llama.cpp/pull/4630/commits/42f5246effafddcf87d67656b58e95030f4bc454.patch' | patch -p1 -R
if: '>=1705<1732'
if: ">=1705<1732"
# -mcpu=native doesn't work on our docker builders
- run: sed -i -e's/-mcpu=native/-mcpu=generic/g' CMakeLists.txt
working-directory: ggml/src/ggml-cpu
Expand All @@ -66,7 +65,7 @@ build:
- cmake -B build $CMAKE_ARGS
- cmake --build build --config Release
- cmake --install build --prefix {{prefix}}
if: '>=4242'
if: ">=4242"

# https://github.com/ggerganov/llama.cpp/blob/master/examples/deprecation-warning/README.md
- |
Expand Down Expand Up @@ -130,10 +129,10 @@ test:
- run: llama.cpp --help
if: <2453
- run: llama.cpp --version
if: '>=2453<3368'
if: ">=2453<3368"
# llama.cpp deprecated in v3368
- run: llama-cli --version
if: '>=3368'
if: ">=3368"
# ^^ testing more than this requires downloading the models 😬

entrypoint: ./entrypoint.sh
Loading