Skip to content

Commit

Permalink
use Makefile for dependency building instead of go generate
Browse files Browse the repository at this point in the history
  • Loading branch information
jmorganca committed Jul 6, 2023
1 parent e423421 commit 9fe0186
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ build
dist
__pycache__
ollama
ggml-metal.metal
18 changes: 18 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
default: ollama

.PHONY: llama
llama:
cmake -S llama -B llama/build -DLLAMA_METAL=on
cmake --build llama/build

.PHONY: ollama
ollama: llama
go build .

.PHONY: app
app: ollama
npm run --prefix app package

clean:
go clean
rm -rf llama/build
2 changes: 0 additions & 2 deletions llama/llama.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

//go:generate cmake -S . -B build
//go:generate cmake --build build
package llama

// #cgo LDFLAGS: -Lbuild -lbinding -lllama -lm -lggml_static -lstdc++
Expand Down
3 changes: 0 additions & 3 deletions llama/llama_metal.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
//go:build metal
package llama

//go:generate cmake -S . -B build --fresh -DLLAMA_METAL=on
//go:generate cmake --build build

0 comments on commit 9fe0186

Please sign in to comment.