Skip to content

Commit dd38ec6

Browse files
JamePengJamePeng
committed
Refining the AVX instruction compilation workflow
1 parent 528a518 commit dd38ec6

File tree

6 files changed

+15
-24
lines changed

6 files changed

+15
-24
lines changed

‎.github/workflows/build-wheels-cu124-cu126-win-basic.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,6 @@ jobs:
7171
$env:CMAKE_ARGS = "-DGGML_CUDA_FORCE_MMQ=on -DCUDA_SEPARABLE_COMPILATION=on $env:CMAKE_ARGS"
7272
$env:CMAKE_ARGS = "-DENABLE_CCACHE=on -DLLAMA_CURL=off $env:CMAKE_ARGS"
7373
74-
# if ($env:AVXVER -eq 'AVX') {
75-
# $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off'
76-
# }
77-
# if ($env:AVXVER -eq 'AVX2') {
78-
# $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=on -DGGML_FMA=off -DGGML_F16C=off'
79-
# }
80-
# if ($env:AVXVER -eq 'AVX512') {
81-
# $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX512=on'
82-
# }
8374
# Basic options for compiling without AVX instructions
8475
if ($env:AVXVER -eq 'Basic') {
8576
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=off -DGGML_AVX2=off -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off'

‎.github/workflows/build-wheels-cu124-cu126-win.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ jobs:
7272
$env:CMAKE_ARGS = "-DENABLE_CCACHE=on -DLLAMA_CURL=off $env:CMAKE_ARGS"
7373
7474
if ($env:AVXVER -eq 'AVX') {
75-
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off'
75+
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off'
7676
}
7777
if ($env:AVXVER -eq 'AVX2') {
78-
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=on -DGGML_FMA=off -DGGML_F16C=off'
78+
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off'
7979
}
8080
if ($env:AVXVER -eq 'AVXVNNI') {
81-
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off'
81+
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off'
8282
}
8383
# if ($env:AVXVER -eq 'AVX512') {
8484
# $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX512=on'

‎.github/workflows/build-wheels-cu124-linux.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=ON"
6767
6868
if [ "${AVXVER}" = "AVX" ]; then
69-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"
69+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"
7070
fi
7171
if [ "${AVXVER}" = "AVX2" ]; then
72-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=on -DGGML_FMA=off -DGGML_F16C=off"
72+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off"
7373
fi
7474
if [ "${AVXVER}" = "AVXVNNI" ]; then
75-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off"
75+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off"
7676
fi
7777
# if [ "${AVXVER}" = "AVX512" ]; then
7878
# CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX512=on"

‎.github/workflows/build-wheels-cu126-linux.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=ON"
6767
6868
if [ "${AVXVER}" = "AVX" ]; then
69-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"
69+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"
7070
fi
7171
if [ "${AVXVER}" = "AVX2" ]; then
72-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=on -DGGML_FMA=off -DGGML_F16C=off"
72+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off"
7373
fi
7474
if [ "${AVXVER}" = "AVXVNNI" ]; then
75-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off"
75+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off"
7676
fi
7777
# if [ "${AVXVER}" = "AVX512" ]; then
7878
# CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX512=on"

‎.github/workflows/build-wheels-cu128-linux.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
CMAKE_ARGS="${CMAKE_ARGS} -DLLAMA_CURL=ON"
6767
6868
if [ "${AVXVER}" = "AVX" ]; then
69-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"
69+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off"
7070
fi
7171
if [ "${AVXVER}" = "AVX2" ]; then
72-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=on -DGGML_FMA=off -DGGML_F16C=off"
72+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off"
7373
fi
7474
if [ "${AVXVER}" = "AVXVNNI" ]; then
75-
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off"
75+
CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off"
7676
fi
7777
# if [ "${AVXVER}" = "AVX512" ]; then
7878
# CMAKE_ARGS="${CMAKE_ARGS} -DGGML_AVX512=on"

‎.github/workflows/build-wheels-cu128-win.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ jobs:
7272
$env:CMAKE_ARGS = "-DENABLE_CCACHE=on -DLLAMA_CURL=off $env:CMAKE_ARGS"
7373
7474
if ($env:AVXVER -eq 'AVX') {
75-
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off'
75+
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=on -DGGML_AVX2=off -DGGML_FMA=off -DGGML_F16C=off'
7676
}
7777
if ($env:AVXVER -eq 'AVX2') {
78-
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=on -DGGML_FMA=off -DGGML_F16C=off'
78+
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX512=off -DGGML_FMA=off -DGGML_F16C=off'
7979
}
8080
if ($env:AVXVER -eq 'AVXVNNI') {
81-
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off'
81+
$env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX=on -DGGML_AVX2=on -DGGML_AVX_VNNI=on -DGGML_FMA=on -DGGML_F16C=off'
8282
}
8383
# if ($env:AVXVER -eq 'AVX512') {
8484
# $env:CMAKE_ARGS = $env:CMAKE_ARGS + ' -DGGML_AVX512=on'

0 commit comments

Comments
 (0)