Skip to content

Commit

Permalink
Base build-info on wasm build, not the native build
Browse files Browse the repository at this point in the history
  • Loading branch information
icppWorld committed Jul 22, 2024
1 parent ad2879a commit 30e5aea
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cicd-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ jobs:
echo "Installing rust"
icpp install-rust
- name: build-info-cpp
- name: build-info-cpp-wasm
shell: bash -l {0}
run: |
make build-info-cpp
make build-info-cpp-wasm
- name: all-static
shell: bash -l {0}
Expand Down
21 changes: 17 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,23 @@ CLANG_TIDY = $(ICPP_COMPILER_ROOT)/bin/clang-tidy
.PHONY: all-tests
all-tests: all-static test-llm-wasm test-llm-native

.PHONY: build-info-cpp
build-info-cpp:
echo "Creating src/llama_cpp_onicai_fork/common/build-info.cpp"
@sh src/llama_cpp_onicai_fork/scripts/build-info.sh clang > src/llama_cpp_onicai_fork/common/build-info.cpp
.PHONY: build-info-cpp-wasm
build-info-cpp-wasm:
@echo "--"
@echo "Creating src/llama_cpp_onicai_fork/common/build-info.cpp for build-wasm"
sh src/llama_cpp_onicai_fork/scripts/build-info.sh $(ICPP_COMPILER_ROOT)/bin/clang > src/llama_cpp_onicai_fork/common/build-info.cpp
@echo "Content of src/llama_cpp_onicai_fork/common/build-info.cpp:"
@echo " "
@cat src/llama_cpp_onicai_fork/common/build-info.cpp

.PHONY: build-info-cpp-native
build-info-cpp-native:
@echo "--"
@echo "Creating src/llama_cpp_onicai_fork/common/build-info.cpp for build-native"
sh src/llama_cpp_onicai_fork/scripts/build-info.sh clang > src/llama_cpp_onicai_fork/common/build-info.cpp
@echo "Content of src/llama_cpp_onicai_fork/common/build-info.cpp:"
@echo " "
@cat src/llama_cpp_onicai_fork/common/build-info.cpp

.PHONY: summary
summary:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Currently, the canister can only be build on a `mac` !

- Create the file src/llama_cpp_onicai_fork/common/build-info.cpp
```
make build-info-cpp
make build-info-cpp-wasm
```
TODO: recipe for Windows.

Expand Down

0 comments on commit 30e5aea

Please sign in to comment.