[PR #3618] [CLOSED] Added grammar (and json schemas and CPU-only Dockerfile) support (from ollama/ollama PR #1606) #11221

Closed
opened 2026-04-12 23:24:39 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/3618
Author: @markcda
Created: 4/12/2024
Status: Closed

Base: mainHead: main


📝 Commits (10+)

  • cca7ec2 Added grammar (and json schemas) support (from ollama/ollama PR #1606)
  • c1e25c6 Merge branch 'ollama:main' into main
  • 84307f0 Merge branch 'main' into main
  • 2c9e4d9 Merge branch 'ollama:main' into main
  • c4e7744 Merge branch 'ollama:main' into main
  • 14f445a add CPU-only docker build
  • c5aaee8 fix CPU-only build
  • 12f26cc Merge branch 'ollama:main' into main
  • 9b625aa Merge branch 'ollama:main' into main
  • ead235a Merge branch 'ollama:main' into cpu-only-docker

📊 Changes

6 files changed (+151 additions, -15 deletions)

View changed files

Dockerfile.cpu-only (+88 -0)
📝 api/types.go (+2 -0)
📝 docs/api.md (+1 -0)
📝 docs/modelfile.md (+19 -15)
examples/grammar/Modelfile (+39 -0)
📝 llm/server.go (+2 -0)

📄 Description

Updated version of #1606.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/3618 **Author:** [@markcda](https://github.com/markcda) **Created:** 4/12/2024 **Status:** ❌ Closed **Base:** `main` ← **Head:** `main` --- ### 📝 Commits (10+) - [`cca7ec2`](https://github.com/ollama/ollama/commit/cca7ec2199b053e2b5a781f1da9dd5965d60ed25) Added grammar (and json schemas) support (from ollama/ollama PR #1606) - [`c1e25c6`](https://github.com/ollama/ollama/commit/c1e25c6388215d3747c8ac26f934292138a69e7d) Merge branch 'ollama:main' into main - [`84307f0`](https://github.com/ollama/ollama/commit/84307f04734b6c1f1399e31a2f2b82a6d55114c7) Merge branch 'main' into main - [`2c9e4d9`](https://github.com/ollama/ollama/commit/2c9e4d9591921f209bcaa781c19a6c1167bdb97e) Merge branch 'ollama:main' into main - [`c4e7744`](https://github.com/ollama/ollama/commit/c4e7744673848ccb781d58ede78d353966284676) Merge branch 'ollama:main' into main - [`14f445a`](https://github.com/ollama/ollama/commit/14f445a8225a71ddd81757951340f706931cf195) add CPU-only docker build - [`c5aaee8`](https://github.com/ollama/ollama/commit/c5aaee8989561488754ff9cac32af6d56a312e95) fix CPU-only build - [`12f26cc`](https://github.com/ollama/ollama/commit/12f26cc73e6478e117175b2b25d9304ba197ac5d) Merge branch 'ollama:main' into main - [`9b625aa`](https://github.com/ollama/ollama/commit/9b625aa902e5bb904bf1df94faa3714229e94dea) Merge branch 'ollama:main' into main - [`ead235a`](https://github.com/ollama/ollama/commit/ead235ad975163534ade745c49dbc41949528889) Merge branch 'ollama:main' into cpu-only-docker ### 📊 Changes **6 files changed** (+151 additions, -15 deletions) <details> <summary>View changed files</summary> ➕ `Dockerfile.cpu-only` (+88 -0) 📝 `api/types.go` (+2 -0) 📝 `docs/api.md` (+1 -0) 📝 `docs/modelfile.md` (+19 -15) ➕ `examples/grammar/Modelfile` (+39 -0) 📝 `llm/server.go` (+2 -0) </details> ### 📄 Description Updated version of #1606. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-12 23:24:39 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#11221