Skip to content

Commit 6a725cf

Browse files
teleprint-meteleprint-me
committed
Merge branch 'master' into auto-model-support
2 parents 5c92809 + b864b50 commit 6a725cf

34 files changed

+1793
-563
lines changed

‎.github/ISSUE_TEMPLATE/01-bug-low.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Low Severity Bugs
2+
description: Used to report low severity bugs in llama.cpp (e.g. cosmetic issues, non critical UI glitches)
3+
title: "Bug: "
4+
labels: ["bug-unconfirmed", "low severity"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
Please include information about your system, the steps to reproduce the bug,
11+
and the version of llama.cpp that you are using.
12+
If possible, please provide a minimal code example that reproduces the bug.
13+
- type: textarea
14+
id: what-happened
15+
attributes:
16+
label: What happened?
17+
description: Also tell us, what did you expect to happen?
18+
placeholder: Tell us what you see!
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: version
23+
attributes:
24+
label: Name and Version
25+
description: Which executable and which version of our software are you running? (use `--version` to get a version string)
26+
placeholder: |
27+
$./main --version
28+
version: 2999 (42b4109e)
29+
built with cc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0 for x86_64-linux-gnu
30+
validations:
31+
required: true
32+
- type: dropdown
33+
id: operating-system
34+
attributes:
35+
label: What operating system are you seeing the problem on?
36+
multiple: true
37+
options:
38+
- Linux
39+
- Mac
40+
- Windows
41+
- BSD
42+
- Other? (Please let us know in description)
43+
validations:
44+
required: false
45+
- type: textarea
46+
id: logs
47+
attributes:
48+
label: Relevant log output
49+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
50+
render: shell

‎.github/ISSUE_TEMPLATE/02-bug-medium.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Medium Severity Bug
2+
description: Used to report medium severity bugs in llama.cpp (e.g. Malfunctioning Features but generally still useable)
3+
title: "Bug: "
4+
labels: ["bug-unconfirmed", "medium severity"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
Please include information about your system, the steps to reproduce the bug,
11+
and the version of llama.cpp that you are using.
12+
If possible, please provide a minimal code example that reproduces the bug.
13+
- type: textarea
14+
id: what-happened
15+
attributes:
16+
label: What happened?
17+
description: Also tell us, what did you expect to happen?
18+
placeholder: Tell us what you see!
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: version
23+
attributes:
24+
label: Name and Version
25+
description: Which executable and which version of our software are you running? (use `--version` to get a version string)
26+
placeholder: |
27+
$./main --version
28+
version: 2999 (42b4109e)
29+
built with cc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0 for x86_64-linux-gnu
30+
validations:
31+
required: true
32+
- type: dropdown
33+
id: operating-system
34+
attributes:
35+
label: What operating system are you seeing the problem on?
36+
multiple: true
37+
options:
38+
- Linux
39+
- Mac
40+
- Windows
41+
- BSD
42+
- Other? (Please let us know in description)
43+
validations:
44+
required: false
45+
- type: textarea
46+
id: logs
47+
attributes:
48+
label: Relevant log output
49+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
50+
render: shell

‎.github/ISSUE_TEMPLATE/03-bug-high.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: High Severity Bug
2+
description: Used to report high severity bugs in llama.cpp (e.g. Malfunctioning features hindering important common workflow)
3+
title: "Bug: "
4+
labels: ["bug-unconfirmed", "high severity"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
Please include information about your system, the steps to reproduce the bug,
11+
and the version of llama.cpp that you are using.
12+
If possible, please provide a minimal code example that reproduces the bug.
13+
- type: textarea
14+
id: what-happened
15+
attributes:
16+
label: What happened?
17+
description: Also tell us, what did you expect to happen?
18+
placeholder: Tell us what you see!
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: version
23+
attributes:
24+
label: Name and Version
25+
description: Which executable and which version of our software are you running? (use `--version` to get a version string)
26+
placeholder: |
27+
$./main --version
28+
version: 2999 (42b4109e)
29+
built with cc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0 for x86_64-linux-gnu
30+
validations:
31+
required: true
32+
- type: dropdown
33+
id: operating-system
34+
attributes:
35+
label: What operating system are you seeing the problem on?
36+
multiple: true
37+
options:
38+
- Linux
39+
- Mac
40+
- Windows
41+
- BSD
42+
- Other? (Please let us know in description)
43+
validations:
44+
required: false
45+
- type: textarea
46+
id: logs
47+
attributes:
48+
label: Relevant log output
49+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
50+
render: shell

‎.github/ISSUE_TEMPLATE/04-bug-critical.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Critical Severity Bug
2+
description: Used to report critical severity bugs in llama.cpp (e.g. Crashing, Corrupted, Dataloss)
3+
title: "Bug: "
4+
labels: ["bug-unconfirmed", "critical severity"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
Please include information about your system, the steps to reproduce the bug,
11+
and the version of llama.cpp that you are using.
12+
If possible, please provide a minimal code example that reproduces the bug.
13+
- type: textarea
14+
id: what-happened
15+
attributes:
16+
label: What happened?
17+
description: Also tell us, what did you expect to happen?
18+
placeholder: Tell us what you see!
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: version
23+
attributes:
24+
label: Name and Version
25+
description: Which executable and which version of our software are you running? (use `--version` to get a version string)
26+
placeholder: |
27+
$./main --version
28+
version: 2999 (42b4109e)
29+
built with cc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0 for x86_64-linux-gnu
30+
validations:
31+
required: true
32+
- type: dropdown
33+
id: operating-system
34+
attributes:
35+
label: What operating system are you seeing the problem on?
36+
multiple: true
37+
options:
38+
- Linux
39+
- Mac
40+
- Windows
41+
- BSD
42+
- Other? (Please let us know in description)
43+
validations:
44+
required: false
45+
- type: textarea
46+
id: logs
47+
attributes:
48+
label: Relevant log output
49+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
50+
render: shell

‎.github/ISSUE_TEMPLATE/05-enhancement.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Enhancement
2+
description: Used to request enhancements for llama.cpp
3+
title: "Feature Request: "
4+
labels: ["enhancement"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
[Please post your idea first in Discussion if there is not yet a consensus for this enhancement request. This will help to keep this issue tracker focused on enhancements that the community has agreed needs to be implemented.](https://github.com/ggerganov/llama.cpp/discussions/categories/ideas)
10+
11+
- type: checkboxes
12+
id: prerequisites
13+
attributes:
14+
label: Prerequisites
15+
description: Please confirm the following before submitting your enhancement request.
16+
options:
17+
- label: I am running the latest code. Mention the version if possible as well.
18+
required: true
19+
- label: I carefully followed the [README.md](https://github.com/ggerganov/llama.cpp/blob/master/README.md).
20+
required: true
21+
- label: I searched using keywords relevant to my issue to make sure that I am creating a new issue that is not already open (or closed).
22+
required: true
23+
- label: I reviewed the [Discussions](https://github.com/ggerganov/llama.cpp/discussions), and have a new and useful enhancement to share.
24+
required: true
25+
26+
- type: textarea
27+
id: feature-description
28+
attributes:
29+
label: Feature Description
30+
description: Please provide a detailed written description of what you were trying to do, and what you expected `llama.cpp` to do as an enhancement.
31+
placeholder: Detailed description of the enhancement
32+
validations:
33+
required: true
34+
35+
- type: textarea
36+
id: motivation
37+
attributes:
38+
label: Motivation
39+
description: Please provide a detailed written description of reasons why this feature is necessary and how it is useful to `llama.cpp` users.
40+
placeholder: Explanation of why this feature is needed and its benefits
41+
validations:
42+
required: true
43+
44+
- type: textarea
45+
id: possible-implementation
46+
attributes:
47+
label: Possible Implementation
48+
description: If you have an idea as to how it can be implemented, please write a detailed description. Feel free to give links to external sources or share visuals that might be helpful to understand the details better.
49+
placeholder: Detailed description of potential implementation
50+
validations:
51+
required: false

‎.github/ISSUE_TEMPLATE/06-question.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Question
2+
description: Used to ask questions about llama.cpp
3+
title: "Question: "
4+
labels: ["question"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
[Please search your question first in Discussion if you got a common general question.](https://github.com/ggerganov/llama.cpp/discussions/categories/q-a)
10+
11+
- type: checkboxes
12+
id: prerequisites
13+
attributes:
14+
label: Prerequisites
15+
description: Please confirm the following before submitting your question.
16+
options:
17+
- label: I searched using keywords relevant to my issue to make sure that I am creating a new issue that is not already open (or closed).
18+
required: true
19+
- label: I reviewed the [Discussions](https://github.com/ggerganov/llama.cpp/discussions), and have a new useful question to share that cannot be answered within Discussions.
20+
required: true
21+
22+
- type: textarea
23+
id: background-description
24+
attributes:
25+
label: Background Description
26+
description: Please provide a detailed written description of what you were trying to do, and what you expected `llama.cpp` to do as an question.
27+
placeholder: Detailed description of your question
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
id: possible-answer
33+
attributes:
34+
label: Possible Answer
35+
description: If you have some idea of possible answers you want to confirm, that would also be appreciated.
36+
placeholder: Your idea of possible answers
37+
validations:
38+
required: false

‎.github/ISSUE_TEMPLATE/07-refactor.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Refactor (Maintainers)
2+
description: Used to track refactoring opportunities
3+
title: "Refactor: "
4+
labels: ["refactor"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Don't forget to [check for existing refactor issue tickets](https://github.com/ggerganov/llama.cpp/issues?q=is%3Aopen+is%3Aissue+label%3Arefactoring) in case it's already covered.
10+
Also you may want to check [Pull request refactor label as well](https://github.com/ggerganov/llama.cpp/pulls?q=is%3Aopen+is%3Apr+label%3Arefactoring) for duplicates too.
11+
12+
- type: textarea
13+
id: background-description
14+
attributes:
15+
label: Background Description
16+
description: Please provide a detailed written description of the pain points you are trying to solve.
17+
placeholder: Detailed description behind your motivation to request refactor
18+
validations:
19+
required: true
20+
21+
- type: textarea
22+
id: possible-approaches
23+
attributes:
24+
label: Possible Refactor Approaches
25+
description: If you have some idea of possible approaches to solve this problem. You may want to make it a todo list.
26+
placeholder: Your idea of possible refactoring opportunity/approaches
27+
validations:
28+
required: false

‎.github/ISSUE_TEMPLATE/bug.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,10 @@ if (LLAMA_SYCL)
628628
add_compile_definitions(GGML_SYCL_F16)
629629
endif()
630630

631+
if (LLAMA_CUDA_FORCE_MMQ)
632+
add_compile_definitions(GGML_SYCL_FORCE_MMQ)
633+
endif()
634+
631635
add_compile_options(-I./) #include DPCT
632636
add_compile_options(-I/${SYCL_INCLUDE_DIR})
633637

‎CMakePresets.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"version": 4,
33
"configurePresets": [
44
{
@@ -40,6 +40,10 @@
4040

4141
{ "name": "arm64-windows-msvc-debug" , "inherits": [ "base", "arm64-windows-msvc", "debug" ] },
4242
{ "name": "arm64-windows-msvc-release", "inherits": [ "base", "arm64-windows-msvc", "release" ] },
43-
{ "name": "arm64-windows-msvc+static-release", "inherits": [ "base", "arm64-windows-msvc", "release", "static" ] }
43+
{ "name": "arm64-windows-msvc+static-release", "inherits": [ "base", "arm64-windows-msvc", "release", "static" ] },
44+
45+
{ "name": "x64-windows-msvc-debug" , "inherits": [ "base", "debug" ] },
46+
{ "name": "x64-windows-msvc-release", "inherits": [ "base", "release" ] },
47+
{ "name": "x64-windows-msvc+static-release", "inherits": [ "base", "release", "static" ] }
4448
]
4549
}

0 commit comments

Comments
 (0)