Skip to content

build: reconfigure nested MLX project before building #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pd95 wants to merge 24 commits into from
Closed

build: reconfigure nested MLX project before building #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
159b1c3
app: fix ChatGPT model selector spacing (#18347)
hoyyeva Sep 9, 2026
c951dab
llama.cpp: version bump b10864 (#18317)
dhiltgen Sep 10, 2026
ea8d650
server: extract GGUF metadata and unify capabilities (#17858)
dhiltgen Sep 10, 2026
8d66f08
mlxrunner: capture whole-state at close for nodes split out of an edge
jessegross Sep 9, 2026
45a0280
mlxrunner: keep cache boundaries out of non-causal media items
jessegross Sep 9, 2026
b859a94
mlxrunner: keep the reused head of a cached edge safe from eviction
jessegross Sep 10, 2026
6137793
mlxrunner: evict the active conversation's own checkpoints under the …
jessegross Sep 9, 2026
1548f78
mlxrunner: bound MLX loads by system free memory while other models a…
jessegross Sep 10, 2026
f09d55d
mlxrunner: wait for a killed runner to exit before the scheduler load…
jessegross Sep 9, 2026
4512d2b
llm: raise token repeat limit to 100 and return error instead of sile…
rick-github Sep 10, 2026
13037ec
mlx: scope array lifetimes instead of pinning and sweeping
jessegross Sep 4, 2026
aeb8f71
mlx: drop the empty-handle checks outside the bindings
jessegross Sep 4, 2026
b68b112
mlxrunner: release the buffers weight loading leaves in the MLX pool
jessegross Sep 10, 2026
c16bf98
cmd: remove built-in agent (#18393)
ParthSareen Sep 11, 2026
53fed26
llm: keep gemma3n projector off the CPU (#18376)
dhiltgen Sep 11, 2026
b17427b
app: refresh Apps layout and command copy feedback (#18372)
hoyyeva Sep 14, 2026
f093c6e
MLX: version bump (#18235)
dhiltgen Sep 14, 2026
2d26faf
docs: add ChatGPT Desktop integration (#18377)
ParthSareen Sep 14, 2026
891b086
mlx: add mlx patch to docker build context (#18440)
dhiltgen Sep 14, 2026
98acec4
create: add server-side MLX imports and drop GGUF conversion (#14969)
dhiltgen Sep 15, 2026
4ea3472
MLX, MLX-C: version bump (#18449)
dhiltgen Sep 15, 2026
2c29c9f
API: Deprecate typical_p (#18448)
dhiltgen Sep 15, 2026
38fdb5d
docs: refresh getting started guides (#18450)
ParthSareen Sep 15, 2026
1109c56
cmake: reconfigure MLX external builds
pd95 Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
superbuild_args: '-DOLLAMA_LLAMA_BACKENDS=vulkan'
expected_payload: lib/ollama/vulkan/libggml-vulkan.so
- preset: 'MLX CUDA 13'
container: nvidia/cuda:13.0.0-devel-ubuntu22.04
container: nvidia/cuda:13.0.0-devel-ubuntu24.04
extra-packages: libcudnn9-dev-cuda-13 libopenblas-dev liblapack-dev liblapacke-dev git curl
superbuild_target: ollama-mlx-cuda_v13
superbuild_dir: build/local-superbuild-mlx-cuda_v13
Expand Down Expand Up @@ -386,7 +386,6 @@ jobs:
go-version-file: go.mod
- name: Verify Go dependency licenses
run: |
# See cmake/generate_go_license.cmake for special case handling.
cmake -S . -B build/go-license \
-DOLLAMA_LLAMA_BACKENDS= \
-DOLLAMA_MLX_BACKENDS= \
Expand Down
10 changes: 10 additions & 0 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ linters:
- bidichk
- bodyclose
- containedctx
- depguard
- gocheckcompilerdirectives
- intrange
- makezero
Expand All @@ -20,6 +21,15 @@ linters:
- errcheck
- usestdlibvars
settings:
depguard:
rules:
test-only-packages:
files:
- $all
- "!$test"
deny:
- pkg: github.com/ollama/ollama/internal/testutil
desc: test helpers may only be imported by test files
govet:
disable:
- unusedresult
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ ENV CGO_LDFLAGS="-L/usr/local/cuda-13/lib64 -L/usr/local/cuda-13/targets/x86_64-
WORKDIR /go/src/github.com/ollama/ollama
COPY CMakeLists.txt CMakePresets.json .
COPY cmake cmake
COPY mlx/compat mlx/compat
COPY x/mlxrunner/mlx x/mlxrunner/mlx
COPY x/mlxrunner/xgrammar/native x/mlxrunner/xgrammar/native
COPY go.mod go.sum .
Expand Down
2 changes: 1 addition & 1 deletion LLAMA_CPP_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b10760
b10864
2 changes: 1 addition & 1 deletion MLX_C_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c74db5307cc8ce122f48d97ef951b30578674e7f
ebc88f10caa1b625e6b581437a8dea6df8a70085
2 changes: 1 addition & 1 deletion MLX_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
37c26e5755da637255d57ea34b4879196a485301
d9add9d11f3154111a4c85f267ec2fd307ecd18e
198 changes: 0 additions & 198 deletions agent/approval.go
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions agent/approval_test.go
View file
Open in desktop

This file was deleted.

Loading