Skip to content

Commit 9a36a5e

Browse files
ggerganovLogicDaemon
ggerganov
authored and
LogicDaemon
committed
common : fix env names to all have LLAMA_ARG_ prefix (ggml-org#23778)
1 parent 9f0e4b1 commit 9a36a5e

35 files changed

Lines changed: 644 additions & 97 deletions

‎.github/workflows/build-3rd-party.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ concurrency:
2222
env:
2323
GGML_NLOOP: 3
2424
GGML_N_THREADS: 1
25-
LLAMA_LOG_COLORS: 1
26-
LLAMA_LOG_PREFIX: 1
27-
LLAMA_LOG_TIMESTAMPS: 1
25+
LLAMA_ARG_LOG_COLORS: 1
26+
LLAMA_ARG_LOG_PREFIX: 1
27+
LLAMA_ARG_LOG_TIMESTAMPS: 1
2828

2929
jobs:
3030
ubuntu-24-llguidance:

‎.github/workflows/build-android.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ concurrency:
2727
env:
2828
GGML_NLOOP: 3
2929
GGML_N_THREADS: 1
30-
LLAMA_LOG_COLORS: 1
31-
LLAMA_LOG_PREFIX: 1
32-
LLAMA_LOG_TIMESTAMPS: 1
30+
LLAMA_ARG_LOG_COLORS: 1
31+
LLAMA_ARG_LOG_PREFIX: 1
32+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3333

3434
jobs:
3535
android:

‎.github/workflows/build-apple.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ concurrency:
3232
env:
3333
GGML_NLOOP: 3
3434
GGML_N_THREADS: 1
35-
LLAMA_LOG_COLORS: 1
36-
LLAMA_LOG_PREFIX: 1
37-
LLAMA_LOG_TIMESTAMPS: 1
35+
LLAMA_ARG_LOG_COLORS: 1
36+
LLAMA_ARG_LOG_PREFIX: 1
37+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3838

3939
jobs:
4040
macos-latest-arm64:

‎.github/workflows/build-cann.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ concurrency:
2929
env:
3030
GGML_NLOOP: 3
3131
GGML_N_THREADS: 1
32-
LLAMA_LOG_COLORS: 1
33-
LLAMA_LOG_PREFIX: 1
34-
LLAMA_LOG_TIMESTAMPS: 1
32+
LLAMA_ARG_LOG_COLORS: 1
33+
LLAMA_ARG_LOG_PREFIX: 1
34+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3535

3636
jobs:
3737
# TODO: this build is disabled to save Github Actions resources (https://github.com/ggml-org/llama.cpp/pull/23705)

‎.github/workflows/build-hip.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ concurrency:
3131
env:
3232
GGML_NLOOP: 3
3333
GGML_N_THREADS: 1
34-
LLAMA_LOG_COLORS: 1
35-
LLAMA_LOG_PREFIX: 1
36-
LLAMA_LOG_TIMESTAMPS: 1
34+
LLAMA_ARG_LOG_COLORS: 1
35+
LLAMA_ARG_LOG_PREFIX: 1
36+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3737

3838
jobs:
3939

‎.github/workflows/build-ibm.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ concurrency:
2929
env:
3030
GGML_NLOOP: 3
3131
GGML_N_THREADS: 1
32-
LLAMA_LOG_COLORS: 1
33-
LLAMA_LOG_PREFIX: 1
34-
LLAMA_LOG_TIMESTAMPS: 1
32+
LLAMA_ARG_LOG_COLORS: 1
33+
LLAMA_ARG_LOG_PREFIX: 1
34+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3535

3636
jobs:
3737

‎.github/workflows/build-msys.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ concurrency:
1515
env:
1616
GGML_NLOOP: 3
1717
GGML_N_THREADS: 1
18-
LLAMA_LOG_COLORS: 1
19-
LLAMA_LOG_PREFIX: 1
20-
LLAMA_LOG_TIMESTAMPS: 1
18+
LLAMA_ARG_LOG_COLORS: 1
19+
LLAMA_ARG_LOG_PREFIX: 1
20+
LLAMA_ARG_LOG_TIMESTAMPS: 1
2121

2222
jobs:
2323
windows-msys2:

‎.github/workflows/build-opencl.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ concurrency:
3030
env:
3131
GGML_NLOOP: 3
3232
GGML_N_THREADS: 1
33-
LLAMA_LOG_COLORS: 1
34-
LLAMA_LOG_PREFIX: 1
35-
LLAMA_LOG_TIMESTAMPS: 1
33+
LLAMA_ARG_LOG_COLORS: 1
34+
LLAMA_ARG_LOG_PREFIX: 1
35+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3636

3737
jobs:
3838

‎.github/workflows/build-openvino.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ concurrency:
2929
env:
3030
GGML_NLOOP: 3
3131
GGML_N_THREADS: 1
32-
LLAMA_LOG_COLORS: 1
33-
LLAMA_LOG_PREFIX: 1
34-
LLAMA_LOG_TIMESTAMPS: 1
32+
LLAMA_ARG_LOG_COLORS: 1
33+
LLAMA_ARG_LOG_PREFIX: 1
34+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3535

3636
jobs:
3737
ubuntu-24-openvino:

‎.github/workflows/build-riscv.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ concurrency:
2929
env:
3030
GGML_NLOOP: 3
3131
GGML_N_THREADS: 1
32-
LLAMA_LOG_COLORS: 1
33-
LLAMA_LOG_PREFIX: 1
34-
LLAMA_LOG_TIMESTAMPS: 1
32+
LLAMA_ARG_LOG_COLORS: 1
33+
LLAMA_ARG_LOG_PREFIX: 1
34+
LLAMA_ARG_LOG_TIMESTAMPS: 1
3535

3636
jobs:
3737
ubuntu-cpu-riscv64-native:

0 commit comments

Comments
 (0)