Skip to content

Commit 289073a

Browse files
committed
Merge 'origin/master' into hipblas
2 parents 1107194 + 173d0e6 commit 289073a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ ifndef LLAMA_NO_ACCELERATE
107107
endif
108108
ifdef LLAMA_OPENBLAS
109109
CFLAGS += -DGGML_USE_OPENBLAS -I/usr/local/include/openblas
110-
LDFLAGS += -lopenblas
110+
ifneq ($(shell grep -e "Arch Linux" -e "ID_LIKE=arch" /etc/os-release 2>/dev/null),)
111+
LDFLAGS += -lopenblas -lcblas
112+
else
113+
LDFLAGS += -lopenblas
114+
endif
111115
endif
112116
ifdef LLAMA_CUBLAS
113117
CFLAGS += -DGGML_USE_CUBLAS -I/usr/local/cuda/include -I/opt/cuda/include -I$(CUDA_PATH)/targets/x86_64-linux/include

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ Building the program with BLAS support may lead to some performance improvements
216216
```bash
217217
make LLAMA_OPENBLAS=1
218218
```
219-
Note: In order to build on Arch Linux with OpenBLAS support enabled you must edit the Makefile adding at the end of the line 105: `-lcblas`
220219

221220
- On Windows:
222221

0 commit comments

Comments
 (0)