diff --git a/Makefile b/Makefile index fbfca7610..4869d2ecf 100644 --- a/Makefile +++ b/Makefile @@ -547,13 +547,13 @@ ifdef GGML_OPENBLAS64 endif # GGML_OPENBLAS64 ifdef GGML_BLIS - MK_CPPFLAGS += -DGGML_USE_BLAS -I/usr/local/include/blis -I/usr/include/blis + MK_CPPFLAGS += -DGGML_USE_BLAS -DGGML_BLAS_USE_BLIS -I/usr/local/include/blis -I/usr/include/blis MK_LDFLAGS += -lblis -L/usr/local/lib OBJ_GGML += ggml/src/ggml-blas.o endif # GGML_BLIS ifdef GGML_NVPL - MK_CPPFLAGS += -DGGML_USE_BLAS -DNVPL_ENABLE_CBLAS -DNVPL_ILP64 -I/usr/local/include/nvpl_blas -I/usr/include/nvpl_blas + MK_CPPFLAGS += -DGGML_USE_BLAS -DGGML_BLAS_USE_NVPL -DNVPL_ILP64 -I/usr/local/include/nvpl_blas -I/usr/include/nvpl_blas MK_LDFLAGS += -L/usr/local/lib -lnvpl_blas_core -lnvpl_blas_ilp64_gomp OBJ_GGML += ggml/src/ggml-blas.o endif # GGML_NVPL diff --git a/ggml/src/ggml-blas.cpp b/ggml/src/ggml-blas.cpp index f7604e580..a37aa4072 100644 --- a/ggml/src/ggml-blas.cpp +++ b/ggml/src/ggml-blas.cpp @@ -8,9 +8,9 @@ # include #elif defined(GGML_BLAS_USE_MKL) # include -#elif defined(BLIS_ENABLE_CBLAS) +#elif defined(GGML_BLAS_USE_BLIS) # include -#elif defined(NVPL_ENABLE_CBLAS) +#elif defined(GGML_BLAS_USE_NVPL) # include #else # include @@ -141,11 +141,11 @@ static void ggml_backend_blas_mul_mat(ggml_backend_blas_context * ctx, struct gg openblas_set_num_threads(ctx->n_threads); #endif -#if defined(BLIS_ENABLE_CBLAS) +#if defined(GGML_BLAS_USE_BLIS) bli_thread_set_num_threads(ctx->n_threads); #endif -#if defined(NVPL_ENABLE_CBLAS) +#if defined(GGML_BLAS_USE_NVPL) nvpl_blas_set_num_threads(ctx->n_threads); #endif