Skip to content

Commit 7cedf6c

Browse files
committed
make github CI happy
1 parent e75c029 commit 7cedf6c

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

ggml.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2987,9 +2987,13 @@ static struct ggml_tensor * ggml_new_tensor_impl(
29872987
/*.data =*/ obj_alloc_size > 0 ? (void *)(result + 1) : data,
29882988
/*.name =*/ { 0 },
29892989
/*.extra =*/ NULL,
2990+
/*.rank =*/ n_dims,
29902991
/*.padding =*/ { 0 },
29912992
};
29922993

2994+
if (ctx->use_hwaccel)
2995+
result->backend = GGML_BACKEND_TYPE_GPU;
2996+
29932997
// TODO: this should not be needed as long as we don't rely on aligned SIMD loads
29942998
//ggml_assert_aligned(result->data);
29952999

ggml.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,9 @@ extern "C" {
591591

592592
void * extra; // extra things e.g. for ggml-cuda.cu
593593

594-
char padding[8];
594+
int32_t rank;
595+
596+
char padding[20];
595597
};
596598

597599
static const size_t GGML_TENSOR_SIZE = sizeof(struct ggml_tensor);

whisper.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4066,14 +4066,6 @@ static int whisper_has_openvino(void) {
40664066
#endif
40674067
}
40684068

4069-
static int whisper_has_qnn(void) {
4070-
#ifdef GGML_USE_QNN
4071-
return 1;
4072-
#else
4073-
return 0;
4074-
#endif
4075-
}
4076-
40774069
const char * whisper_print_system_info(void) {
40784070
static std::string s;
40794071

@@ -4095,8 +4087,6 @@ const char * whisper_print_system_info(void) {
40954087
s += "CUDA = " + std::to_string(ggml_cpu_has_cuda()) + " | ";
40964088
s += "COREML = " + std::to_string(whisper_has_coreml()) + " | ";
40974089
s += "OPENVINO = " + std::to_string(whisper_has_openvino()) + " | ";
4098-
s += "QNN = " + std::to_string(whisper_has_qnn()) ;
4099-
41004090

41014091
return s.c_str();
41024092
}

0 commit comments

Comments
 (0)