Skip to content

Commit f769c92

Browse files
committed
Try to fix apple tests
Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent 49f6e82 commit f769c92

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/image-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
# Pushing with all jobs in parallel
3434
# eats the bandwidth of all the nodes
3535
max-parallel: ${{ github.event_name != 'pull_request' && 4 || 8 }}
36+
fail-fast: false
3637
matrix:
3738
include:
3839
# This is basically covered by the AIO test

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,11 @@ ifeq ($(OS),Darwin)
119119
WHISPER_CMAKE_ARGS+=-DGGML_METAL=OFF
120120
export GGML_NO_ACCELERATE=1
121121
export GGML_NO_METAL=1
122+
GO_LDFLAGS_WHISPER+=-lggml-blas
123+
export WHISPER_LIBRARY_PATH:=$(WHISPER_LIBRARY_PATH):$(WHISPER_DIR)/build/ggml/src/ggml-blas
122124
endif
123125

124126
ifeq ($(BUILD_TYPE),metal)
125-
# -lcblas removed: it seems to always be listed as a duplicate flag.
126127
CGO_LDFLAGS += -framework Accelerate
127128
CGO_LDFLAGS_WHISPER+=-lggml-metal -lggml-blas
128129
CMAKE_ARGS+=-DGGML_METAL=ON
@@ -137,6 +138,9 @@ ifeq ($(OS),Darwin)
137138
WHISPER_CMAKE_ARGS+=-DWHISPER_BUILD_SERVER=OFF
138139
WHISPER_CMAKE_ARGS+=-DGGML_OPENMP=OFF
139140
export WHISPER_LIBRARY_PATH:=$(WHISPER_LIBRARY_PATH):$(WHISPER_DIR)/build/ggml/src/ggml-metal/:$(WHISPER_DIR)/build/ggml/src/ggml-blas
141+
else
142+
CGO_LDFLAGS_WHISPER+=-lggml-blas
143+
export WHISPER_LIBRARY_PATH:=$(WHISPER_LIBRARY_PATH):$(WHISPER_DIR)/build/ggml/src/ggml-blas
140144
endif
141145
else
142146
CGO_LDFLAGS_WHISPER+=-lgomp
@@ -166,15 +170,11 @@ endif
166170
ifneq (,$(findstring sycl,$(BUILD_TYPE)))
167171
export GGML_SYCL=1
168172
CMAKE_ARGS+=-DGGML_SYCL=ON
169-
WHISPER_CMAKE_ARGS+=-DGGML_SYCL=ON
170-
CGO_LDFLAGS_WHISPER+=-lggml-sycl
171-
export WHISPER_LIBRARY_PATH:=$(WHISPER_LIBRARY_PATH):$(WHISPER_DIR)/build/ggml/src/ggml-sycl/
172173
endif
173174

174175
ifeq ($(BUILD_TYPE),sycl_f16)
175176
export GGML_SYCL_F16=1
176177
CMAKE_ARGS+=-DGGML_SYCL_F16=ON
177-
WHISPER_CMAKE_ARGS+=-DGGML_SYCL_F16=ON
178178
endif
179179

180180
ifeq ($(BUILD_TYPE),hipblas)

0 commit comments

Comments
 (0)