Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps(llama.cpp): bump to latest, update build variables #2669

Merged
merged 8 commits into from
Jun 27, 2024
Merged

deps(llama.cpp): bump to latest, update build variables #2669

merged 8 commits into from
Jun 27, 2024

Conversation

mudler
Copy link
Owner

@mudler mudler commented Jun 27, 2024

Description

This PR updates llama.cpp and adapts the build variables (see ggerganov/llama.cpp#8006)

Supersedes #2652

It's going to be fine!

Copy link

netlify bot commented Jun 27, 2024

Deploy Preview for localai ready!

Name Link
🔨 Latest commit c9ca664
🔍 Latest deploy log https://app.netlify.com/sites/localai/deploys/667dad80d1dc700008833d7b
😎 Deploy Preview https://deploy-preview-2669--localai.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@mudler mudler force-pushed the bump branch 2 times, most recently from 1835703 to 621778b Compare June 27, 2024 08:29
@mudler
Copy link
Owner Author

mudler commented Jun 27, 2024

mh, this is unexpected:

[ 64%] Building CXX object common/CMakeFiles/common.dir/sampling.cpp.o
[ 64%] Building CXX object common/CMakeFiles/common.dir/console.cpp.o
[ 70%] Building CXX object common/CMakeFiles/common.dir/grammar-parser.cpp.o
[ 76%] Building CXX object common/CMakeFiles/common.dir/json-schema-to-grammar.cpp.o
[ 76%] Building CXX object common/CMakeFiles/common.dir/train.cpp.o
[ 82%] Building CXX object common/CMakeFiles/common.dir/ngram-cache.cpp.o
[ 82%] Linking CXX static library libcommon.a
[ 82%] Built target common
[ 88%] Building CXX object examples/grpc-server/CMakeFiles/myclip.dir/clip.cpp.o
[ 88%] Building CXX object examples/grpc-server/CMakeFiles/myclip.dir/llava.cpp.o
[ 94%] Linking CXX shared library libmyclip.so
[ 94%] Built target myclip
[ 94%] Building CXX object examples/grpc-server/CMakeFiles/grpc-server.dir/grpc-server.cpp.o
[100%] Linking CXX executable ../../bin/grpc-server
/usr/lib64/gcc/x86_64-suse-linux/13/../../../../x86_64-suse-linux/bin/ld: ../../bin/grpc-server: hidden symbol `_ZN6google8protobuf2io19EpsCopyOutputStream16WriteRawFallbackEPKviPh' in /home/mudler/_git/LocalAI/backend/cpp/grpc/installed_packages/lib64/libprotobuf.a(coded_stream.cc.o) is referenced by DSO
/usr/lib64/gcc/x86_64-suse-linux/13/../../../../x86_64-suse-linux/bin/ld: final link failed: bad value
collect2: error: ld returned 1 exit status
gmake[7]: *** [examples/grpc-server/CMakeFiles/grpc-server.dir/build.make:199: bin/grpc-server] Error 1
gmake[6]: *** [CMakeFiles/Makefile2:3413: examples/grpc-server/CMakeFiles/grpc-server.dir/all] Error 2
gmake[5]: *** [CMakeFiles/Makefile2:3420: examples/grpc-server/CMakeFiles/grpc-server.dir/rule] Error 2
gmake[4]: *** [Makefile:1349: grpc-server] Error 2
gmake[4]: Leaving directory '/home/mudler/_git/LocalAI/backend/cpp/llama-avx2/llama.cpp/build'

@mudler
Copy link
Owner Author

mudler commented Jun 27, 2024

Seems I'm hitting ggerganov/llama.cpp#8166

mudler and others added 3 commits June 27, 2024 15:42
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Update build recipes with ggerganov/llama.cpp#8006

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
@mudler
Copy link
Owner Author

mudler commented Jun 27, 2024

Builds locally now by setting -DBUILD_SHARED_LIBS=OFF - which restores the old linker behavior (static)

@mudler
Copy link
Owner Author

mudler commented Jun 27, 2024

Some more fun is needed for MacOS it seems:

make[4]: *** No rule to make target `ggml-metal'.  Stop.

Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
@mudler mudler merged commit 7b1e792 into master Jun 27, 2024
39 checks passed
@mudler mudler deleted the bump branch June 27, 2024 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant