Merge pull request #68 from mutablelogic/djt-0517-build

Updated build testing for MacOS

Author: djthorpe

Makefile

@@ -60,6 +60,7 @@ docker: docker-dep submodule
 		--build-arg OS=${OS} \
 		--build-arg SOURCE=${BUILD_MODULE} \
 		--build-arg VERSION=${VERSION} \
+		--build-arg GGML_CUDA=${GGML_CUDA} \
 		-f etc/Dockerfile .
 
 # Test whisper bindings
@@ -123,7 +124,7 @@ mkdir:
 # go mod tidy
 go-tidy: go-dep
 	@echo Tidy
-	@go mod tidy
+	@${GO} mod tidy
 
 # Clean
 clean: submodule-clean go-tidy

README.md

@@ -72,14 +72,15 @@ There's more information on the API [here](doc/API.md).
 If you are building a docker image, you just need make and docker installed:
 
 * `DOCKER_REGISTRY=docker.io/user make docker` - builds a docker container with the
-  server binary, tagged to a specific registry
+  server binary for CUDA, tagged to a specific registry
+* `OS=linux GGML_CUDA=0 DOCKER_REGISTRY=docker.io/user make docker` - builds a docker container
+  for Linux, with the server binary without CUDA, tagged to a specific registry
 
-If you want to build the server yourself for your specific combination of hardware (for example,
-on MacOS), you can use the `Makefile` in the root directory and have the following dependencies
-met:
+If you want to build the server without docker, you can use the `Makefile` in the root 
+directory and have the following dependencies met:
 
-* Go 1.22
-* C++ compiler
+* Recent version of Go (ie, 1.22+)
+* C++ compiler and cmake
 * FFmpeg 6.1 libraries (see [here](doc/build.md) for more information)
 * For CUDA, you'll need the CUDA toolkit installed including the `nvcc` compiler
 

etc/Dockerfile

@@ -2,19 +2,21 @@ ARG BASE_TAG=1.0.2
 ARG BASE_DEV_CONTAINER=ghcr.io/mutablelogic/cuda-dev:${BASE_TAG}
 ARG BASE_RUN_CONTAINER=ghcr.io/mutablelogic/cuda-rt:${BASE_TAG}
 ARG CUDA_DOCKER_ARCH=all
-ARG GO_VERSION=1.22.5
+ARG GGML_CUDA=1
+ARG GO_VERSION=1.24.3
 ARG ARCH
 ARG OS
 
 # Setup build container
 FROM ${BASE_DEV_CONTAINER} AS build
 ARG CUDA_DOCKER_ARCH
+ARG GGML_CUDA
 ARG GO_VERSION
 ARG ARCH
 ARG OS
 
 RUN apt-get -y update \
- && apt-get -y install software-properties-common curl libgomp1 \
+ && apt-get -y install software-properties-common cmake curl libgomp1 \
  && add-apt-repository -y ppa:ubuntuhandbook1/ffmpeg6 \
  && apt-get -y update \
  && apt-get -y install libavformat-dev libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev
@@ -29,7 +31,7 @@ COPY . .
 
 # Make whisper-server
 ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
-ENV GGML_CUDA=1
+ENV GGML_CUDA=${GGML_CUDA}
 RUN make -j$(nproc)
 
 # Setup runtime container