ggerganov commited on
Commit
a8eb666
·
unverified ·
1 Parent(s): 4fdb9d2

cuda : fix HIPBLAS build (#2234)

Browse files
Files changed (2) hide show
  1. Makefile +1 -1
  2. whisper.cpp +1 -1
Makefile CHANGED
@@ -297,10 +297,10 @@ ggml-cuda/%.o: ggml-cuda/%.cu ggml-cuda/%.cuh ggml.h ggml-common.h ggml-cuda/com
297
 
298
  ggml-cuda.o: ggml-cuda.cu ggml-cuda.h ggml.h ggml-backend.h ggml-backend-impl.h ggml-common.h $(wildcard ggml-cuda/*.cuh)
299
  $(NVCC) $(NVCCFLAGS) $(CXXFLAGS) -Wno-pedantic -c $< -o $@
300
- endif
301
 
302
  whisper-mel-cuda.o: whisper-mel-cuda.cu whisper.h ggml.h ggml-backend.h whisper-mel.hpp whisper-mel-cuda.hpp
303
  $(NVCC) $(NVCCFLAGS) $(CXXFLAGS) -Wno-pedantic -c $< -o $@
 
304
 
305
  ifdef WHISPER_HIPBLAS
306
  ROCM_PATH ?= /opt/rocm
 
297
 
298
  ggml-cuda.o: ggml-cuda.cu ggml-cuda.h ggml.h ggml-backend.h ggml-backend-impl.h ggml-common.h $(wildcard ggml-cuda/*.cuh)
299
  $(NVCC) $(NVCCFLAGS) $(CXXFLAGS) -Wno-pedantic -c $< -o $@
 
300
 
301
  whisper-mel-cuda.o: whisper-mel-cuda.cu whisper.h ggml.h ggml-backend.h whisper-mel.hpp whisper-mel-cuda.hpp
302
  $(NVCC) $(NVCCFLAGS) $(CXXFLAGS) -Wno-pedantic -c $< -o $@
303
+ endif
304
 
305
  ifdef WHISPER_HIPBLAS
306
  ROCM_PATH ?= /opt/rocm
whisper.cpp CHANGED
@@ -3167,7 +3167,7 @@ struct mel_calc_cpu : public whisper_mel_calc {
3167
  }
3168
 
3169
  whisper_mel_calc * whisper_mel_calc_create(ggml_backend_t backend, const whisper_filters & filters) {
3170
- #if GGML_USE_CUDA
3171
  if (ggml_backend_is_cuda(backend)) {
3172
  auto ret = whisper_mel_calc_create_cuda(backend, filters);
3173
  // run a warmup to avoid the first kernel launch overhead (thus we get the best perf even on the first run)
 
3167
  }
3168
 
3169
  whisper_mel_calc * whisper_mel_calc_create(ggml_backend_t backend, const whisper_filters & filters) {
3170
+ #if defined(GGML_USE_CUDA) && !defined(GGML_USE_HIPBLAS)
3171
  if (ggml_backend_is_cuda(backend)) {
3172
  auto ret = whisper_mel_calc_create_cuda(backend, filters);
3173
  // run a warmup to avoid the first kernel launch overhead (thus we get the best perf even on the first run)