Skip to content

Commit 7db77fe

Browse files
committed
Updates
1 parent 653db47 commit 7db77fe

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
DOCKER=$(shell which docker)
33
GIT=$(shell which git)
44

5+
# Other paths
6+
ROOT_PATH := $(CURDIR)
7+
BUILD_DIR := build
8+
59
# Set OS and Architecture
610
ARCH ?= $(shell arch | tr A-Z a-z | sed 's/x86_64/amd64/' | sed 's/i386/amd64/' | sed 's/armv7l/arm/' | sed 's/aarch64/arm64/')
711
OS ?= $(shell uname | tr A-Z a-z)
@@ -39,7 +43,7 @@ docker: docker-dep docker-base
3943
-f Dockerfile.llamacpp .
4044

4145
# Build llama-server
42-
llama-server: submodule
46+
llama-server: submodule-checkout
4347
@echo "Building llama-server"
4448
@cd llama.cpp && make -j$(nproc) llama-server
4549

@@ -56,10 +60,20 @@ submodule-update: git-dep
5660
@${GIT} submodule foreach git pull origin master
5761

5862
# Submodule checkout
59-
submodule: git-dep
63+
submodule-checkout: git-dep
6064
@echo "Checking out submodules"
6165
@${GIT} submodule update --init --recursive --remote
6266

67+
# Make build directory
68+
mkdir:
69+
@echo Mkdir ${BUILD_DIR}
70+
@install -d ${BUILD_DIR}
71+
72+
# Clean
73+
clean: submodule-clean
74+
@echo "Cleaning"
75+
@rm -rf ${BUILD_DIR}
76+
6377
# Check for docker
6478
docker-dep:
6579
@test -f "${DOCKER}" && test -x "${DOCKER}" || (echo "Missing docker binary" && exit 1)

llama.cpp

0 commit comments

Comments
 (0)