Skip to content
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.

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

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

Closed
wants to merge 38 commits into from

Conversation

markcda
Copy link

@markcda markcda commented Apr 12, 2024

Updated version of #1606.

@ravenscroftj ravenscroftj mentioned this pull request Apr 14, 2024
@qkxie
Copy link

qkxie commented Apr 23, 2024

waiting for merging

@markcda markcda changed the title Added grammar (and json schemas) support (from ollama/ollama PR #1606) Added grammar (and json schemas and CPU-only Dockerfile) support (from ollama/ollama PR #1606) May 10, 2024
@mitar
Copy link

mitar commented May 29, 2024

This looks really cool. Could this be merged? It is a simple PR which just passes options to llama.cpp.

@mitar
Copy link

mitar commented May 29, 2024

Also, it would be useful to have llama.cpp which includes ggerganov/llama.cpp#6811 and ggerganov/llama.cpp#7424 because they bring performance improvements to grammar sampling.

@markcda
Copy link
Author

markcda commented May 30, 2024

Also, it would be useful to have llama.cpp which includes ggerganov/llama.cpp#6811 and ggerganov/llama.cpp#7424 because they bring performance improvements to grammar sampling.

I think I can merge it to my fork for now while this pull request wasn't merged.

@mitar
Copy link

mitar commented May 31, 2024

@jmorganca There are bunch of PRs adding grammar support to Ollama, I think it would be great if this PR or some other could be merged, especially given that llama.cpp now supports also providing JSON schema directly. This is very powerful feature.

@mitar
Copy link

mitar commented Jun 1, 2024

@markcda This PR is pretty ugly because you made PR from the main branch of your fork, not a feature branch. Also, you are merging upstream (this repository) changes into your branch, instead of rebasing. So there is bunch of useless commits from the view of this repository.

@mitar
Copy link

mitar commented Jun 1, 2024

Also why is CPU only Dockerfile part of this PR and not another PR?

@coder543
Copy link

coder543 commented Jun 1, 2024

@mitar are you one of the maintainers here? These things would only matter if the maintainers were reviewing this PR... so far, they've shown no inclination to accept any of the grammar PRs.

@mitar
Copy link

mitar commented Jun 1, 2024

No, I am not. But if PR hopes to be merged at all, then this matters. In general it is a good etiquette. Otherwise what's the point of the MR?

@coder543
Copy link

coder543 commented Jun 1, 2024

We don’t know what the maintainers care about.

@markcda markcda closed this Jun 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants