Merge 'origin/master' into hipblas

This commit is contained in:
Henri Vasserman 2023-05-06 19:59:41 +03:00
commit 289073a532
No known key found for this signature in database
GPG key ID: 2995FC0F58B1A986
2 changed files with 5 additions and 2 deletions

View file

@ -107,7 +107,11 @@ ifndef LLAMA_NO_ACCELERATE
endif
ifdef LLAMA_OPENBLAS
CFLAGS += -DGGML_USE_OPENBLAS -I/usr/local/include/openblas
LDFLAGS += -lopenblas
ifneq ($(shell grep -e "Arch Linux" -e "ID_LIKE=arch" /etc/os-release 2>/dev/null),)
LDFLAGS += -lopenblas -lcblas
else
LDFLAGS += -lopenblas
endif
endif
ifdef LLAMA_CUBLAS
CFLAGS += -DGGML_USE_CUBLAS -I/usr/local/cuda/include -I/opt/cuda/include -I$(CUDA_PATH)/targets/x86_64-linux/include

View file

@ -216,7 +216,6 @@ Building the program with BLAS support may lead to some performance improvements
```bash
make LLAMA_OPENBLAS=1
```
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`
- On Windows: