Commit Graph

4787 Commits

Author SHA1 Message Date
Michael Yang 2e742544bf
prefer ollama engine for qwen3moe (#12374) 2025-09-24 11:21:32 -07:00
Daniel Hiltgen c57cd59be7 fix - trust the library paths from discovery when starting runner 2025-09-24 10:49:39 -07:00
Daniel Hiltgen c86af47ac0 WIP - wire up Vulkan with the new engine based discovery
Not a complete implementation - free VRAM is better, but not accurate on
windows
2025-09-24 10:49:39 -07:00
Devon Rifkin bbb195a6ff
Merge pull request #12393 from ollama/drifkin/fix-built-ins
harmony: don't sanitize built-ins
2025-09-23 23:45:31 -07:00
Devon Rifkin fd88cd7cb0 harmony: don't sanitize built-ins
In #11910 we started sanitizing function names, but we accidentally were
modifying built-ins like `browser.open` to `browser_open`. This was
removing the special prompt rendering for built-ins, but this wasn't
immediately apparent since the models seem to be reasonably good at
remembering the built-ins even when presented with these slightly
renamed version. This fix prevents built-ins from ever being renamed.
2025-09-23 23:34:55 -07:00
Michael Yang e1979c571a
fix: leaf alt name (#12390)
a leaf node with an alternative name gets all its alternatives names
added into the same branch rather than creating branches themselves
2025-09-23 17:50:53 -07:00
Michael Yang bf78ed6ee9
add pre:, suf: to tags (#12274) 2025-09-23 16:08:57 -07:00
Michael Yang a40d427bce
multi-regexp pretokenizer (#12325) 2025-09-23 13:21:47 -07:00
Patrick Devine 64883e3c4c
auth: fix problems with the ollama keypairs (#12373)
* auth: fix problems with the ollama keypairs

This change adds several fixes including:
  - reading in the pubkey files correctly
  - fixing the push unit test to create a keypair file in a temp directory
  - not return 500 errors for normal status error
2025-09-22 23:20:20 -07:00
Inforithmics 66bdd882f5 Merge remote-tracking branch 'upstream/main' into vulkanV3 2025-09-22 23:24:36 +02:00
Devon Rifkin 41efdd4048
Merge pull request #12339 from ollama/drifkin/harmony-refactor-to-builtin
harmony: remove special casing in routes.go
2025-09-22 13:13:40 -07:00
Daniel Hiltgen c23e6f4cae
tests: add single threaded history test (#12295)
* tests: add single threaded history test

Also tidies up some existing tests to handle more model output variation

* test: add support for testing specific architectures
2025-09-22 11:23:14 -07:00
jmorganca af060eb250 docs: update cloud.md for cloud models 2025-09-22 13:09:17 -03:00
jmorganca ae5c33008e docs: move turbo.md to cloud.md 2025-09-22 13:09:17 -03:00
Daniel Hiltgen 3a8ee62bd5 Merge remote-tracking branch 'inforithmics/vulkanV3' into engine_based_discovery_with_vulkan 2025-09-21 14:04:22 -07:00
Daniel Hiltgen 3566fe0e7b timing info for runner 2025-09-21 13:53:24 -07:00
Daniel Hiltgen f761292516 Use runners for GPU discovery
This revamps how we discover GPUs in the system by leveraging the Ollama
runner.  This should eliminate inconsistency between our GPU discovery and the
runners capabilities at runtime, particularly for cases where we try to filter
out unsupported GPUs.  Now the runner does that implicitly based on the actual
device list.  In some cases free VRAM reporting can be unreliable which can
leaad to scheduling mistakes, so this also includes a patch to leverage more
reliable VRAM reporting libraries if available.

Automatic workarounds have been removed as only one GPU leveraged this, which
is now documented. This GPU will soon fall off the support matrix with the next
ROCm bump.

Additional cleanup of the scheduler and discovery packages can be done in the
future once we have switched on the new memory management code, and removed
support for the llama runner.
2025-09-21 13:53:24 -07:00
Devon Rifkin 3677842ff1
Merge pull request #12358 from ollama/drifkin/qwen3-coder-ampersands
parsers: fix `&`s in qwen3coder parameter values
2025-09-20 12:40:33 -07:00
Devon Rifkin 242df70a75 parsers: fix `&`s in qwen3coder parameter values
In <https://github.com/ollama/ollama/issues/12357> we that the model
will output tool calls such as

```
<function=shell>
<parameter=command>
pwd && ls -la
</parameter>
</function>
```

We parse this using the approach of transforming into valid xml and then
using an xml parser. While we do transform the function and parameter
names, we weren't escaping the parameter values (which in this example
are invalid since `pwd && ls -la` contains unescaped ampersands).

This has been fixed by first transforming the tags in the same way, and
then walking the transformed string and escaping the text in between the
tags. This also fixes a case where `<` in the middle of a parameter
value would cause an xml parse failure.

Fixes: #12357
2025-09-20 12:11:38 -07:00
Inforithmics 1cb70716bf revert debug code 2025-09-20 15:26:24 +02:00
Inforithmics d26d920fb2 Filter out already supported gpus 2025-09-20 15:18:39 +02:00
Thomas Stocker bd27162f24
Add Vulkan to Build Matrix
Vulkan Builds on CI
2025-09-20 11:06:35 +02:00
Inforithmics 04fba9ba09 revert debugging changes 2025-09-20 11:03:09 +02:00
Inforithmics 2098e6a8e3 trying to use version 1.4.313 2025-09-20 11:00:37 +02:00
Inforithmics fe47191720 add some more extra 2025-09-20 10:53:43 +02:00
Inforithmics 6f546457de try again 2025-09-20 10:49:24 +02:00
Inforithmics 19bc49de5f try without version number 2025-09-20 10:48:18 +02:00
Inforithmics a7557cf1a8 trying again 2025-09-20 10:39:05 +02:00
Inforithmics 3ccc18f1e1 try again 2025-09-20 10:36:48 +02:00
Inforithmics 79a0f526b1 fixed vulkan-sdk name 2025-09-20 10:33:23 +02:00
Inforithmics 0f86789808 fix version 2025-09-20 10:31:44 +02:00
Inforithmics 62a8d66002 trying again 2025-09-20 10:30:31 +02:00
Inforithmics 26df69a025 trying again 2025-09-20 10:24:31 +02:00
Inforithmics 475d2c2583 trying to fix 2025-09-20 10:15:29 +02:00
Inforithmics c91b494a8b fix version 2025-09-20 10:10:10 +02:00
Inforithmics af50fd5af7 try again linux build 2025-09-20 10:08:24 +02:00
Inforithmics 236c274017 temporarly disable cuda and rocm 2025-09-20 10:00:14 +02:00
Inforithmics e29bb17613 trying to build vulkan for linux 2025-09-20 09:58:31 +02:00
Inforithmics a0389785c7 revert windows-latest 2025-09-20 09:45:36 +02:00
Inforithmics b244c9f9f3 revert debugging changes (vulkan builds on windows) 2025-09-20 09:44:09 +02:00
Inforithmics 6e310d1cb6 fixed install command 2025-09-20 09:37:25 +02:00
Inforithmics b4595f0022 correct vulkan silent install 2025-09-20 09:31:58 +02:00
Inforithmics 7e161f1dbf correct vulkan install 2025-09-20 09:16:54 +02:00
Inforithmics d1125ea349 comment out cude for faster turnaround 2025-09-20 09:14:02 +02:00
Inforithmics c972cf6d46 set vulkan path 2025-09-20 09:12:14 +02:00
Inforithmics 45f7850e75 temporarly commenting out rocm 2025-09-20 09:04:30 +02:00
Inforithmics e2b38c391b commenting out error action stop 2025-09-20 09:02:55 +02:00
Inforithmics ed03bb7928 reenable cpu 2025-09-20 09:01:25 +02:00
Inforithmics c84ac53579 Commenting out other presets to build vulkan 2025-09-20 09:00:26 +02:00
Inforithmics a4461bc0d4 use temporarly windows-latest for build 2025-09-20 08:46:59 +02:00