Skip to content

arg: fix order to use short form before long form - #18196

Merged
ngxson merged 5 commits into
ggml-org:masterfrom
ServeurpersoCom:fix/arg-order-short-before-long
Dec 19, 2025
Merged

ngxson merged 5 commits into
ggml-org:masterfrom
ServeurpersoCom:fix/arg-order-short-before-long

Conversation

@ServeurpersoCom

Copy link
Copy Markdown
Contributor

Make sure to read the contributing guidelines before submitting a PR

Minor cosmetics for logs :
Fixes argument order to follow convention: short form before long form (e.g., {"-x", "--xxx"} instead of {"--xxx", "-x"}).

This affects how arguments appear in logs since to_string() uses .back().

Found via: grep -n '{"--[a-z-]*", "-[a-z]' common/arg.cpp

Fixed 8 arguments:

  • -cram, --cache-ram
  • -kvu, --kv-unified
  • -ot, --override-tensor
  • -otd, --override-tensor-draft
  • -cmoe, --cpu-moe
  • -ncmoe, --n-cpu-moe
  • -cmoed, --cpu-moe-draft
  • -ncmoed, --n-cpu-moe-draft

@ngxson

ngxson commented Dec 19, 2025

Copy link
Copy Markdown
Collaborator

I think it's worth adding a check in test-arg-parser too:

  • If the option has more than one argument, make sure the first argument is shorter than the second
  • Apply the same check with arg_neg

@ServeurpersoCom

Copy link
Copy Markdown
Contributor Author

"the SRV_INF macro should already be prefixed with the function name, so I think this is not necessary:
#define SRV_INF(fmt, ...) LOG_INF("srv %12.*s: " fmt, 12, func, VA_ARGS)"
Nice!

This PR just need test-arg-parser order with arg_neg

@ServeurpersoCom
ServeurpersoCom force-pushed the fix/arg-order-short-before-long branch from 0931684 to 4d0d1c2 Compare December 19, 2025 13:02
@github-actions github-actions Bot added the testing Everything test related label Dec 19, 2025
Comment thread tests/test-arg-parser.cpp Outdated
simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified
@ServeurpersoCom

Copy link
Copy Markdown
Contributor Author

Need doc update :)

@ngxson
ngxson merged commit 14931a8 into ggml-org:master Dec 19, 2025
62 of 68 checks passed
blime4 referenced this pull request in blime4/llama.cpp Feb 5, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
Seunghhon pushed a commit to Seunghhon/llama.cpp that referenced this pull request Apr 26, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
my-other-github-account pushed a commit to my-other-github-account/llama.cpp that referenced this pull request May 15, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
fukuro-kun pushed a commit to fukuro-kun/fukuro-llama-cpp-turboquant that referenced this pull request Jul 5, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
MrLordCat referenced this pull request in MrLordCat/llama.cpp-rdna-lab Jul 16, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
zommiommy pushed a commit to zommiommy/llama.cpp that referenced this pull request Aug 18, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
frostyautumnleaf pushed a commit to frostyautumnleaf/llama.cpp that referenced this pull request Oct 5, 2026
* arg: fix order to use short form before long form

* arg: update doc

* arg: update test-arg-parser

* arg: address review feedback from ngxson

simplified to check first.length() <= last.length() only
fixed: --sampler-seq, --rerank, --draft ordering
note: middle positions in 3+ arg sets are not verified

* arg: update doc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

examples server testing Everything test related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants