whisper-cpp: make compatible with --HEAD install
#202270
Open
+21
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is to accommodate the build system changes in the upcoming v1.7.4
mislav
force-pushed
the
whisper-cpp-head
branch
from
a7ac849 to
0fd2a7e
Compare
carlocab
reviewed
Dec 24, 2024
| @@ -24,7 +24,7 @@ class WhisperCpp < Formula | |||
|
|
|||
| def install | |||
| args = %W[ | |||
| -DBUILD_SHARED_LIBS=OFF | |||
| -DBUILD_SHARED_LIBS=#{head? ? "ON" : "OFF"} | |||
There was a problem hiding this comment.
Suggested change
| -DBUILD_SHARED_LIBS=#{head? ? "ON" : "OFF"} | |
| -DBUILD_SHARED_LIBS=#{build.head? ? "ON" : "OFF"} |
| @@ -33,11 +33,27 @@ def install | |||
| -DWHISPER_BUILD_SERVER=OFF | |||
| ] | |||
| args << "-DLLAMA_METAL_MACOSX_VERSION_MIN=#{MacOS.version}" if OS.mac? | |||
| args << "-DCMAKE_INSTALL_RPATH=#{OS.mac? ? "@loader_path/../libinternal" : "'$ORIGIN/../libinternal'"}" if head? | |||
There was a problem hiding this comment.
Use the rpath helper (and build.head?) instead:
Suggested change
| args << "-DCMAKE_INSTALL_RPATH=#{OS.mac? ? "@loader_path/../libinternal" : "'$ORIGIN/../libinternal'"}" if head? | |
| args << "-DCMAKE_INSTALL_RPATH=#{rpath(target: prefix/"libinternal")}" if build.head? |
| system "cmake", "--build", "build", "--target", "main" | ||
| bin.install "build/bin/main" => "whisper-cpp" | ||
| # avoid installing libggml libraries to "lib" since they would conflict with llama.cpp | ||
| system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args(install_libdir: "libinternal") |
There was a problem hiding this comment.
Suggested change
| system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args(install_libdir: "libinternal") | |
| system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args(install_libdir: "lib/ggml") |
Maybe? You'll need to adjust the argument to #rpath from my suggestion above if you apply this. (to rpath(target: lib/"ggml")).
Though, ideally we should be using libggml from llama.cpp instead (or vice-versa).
| bin.install "build/bin/main" => "whisper-cpp" | ||
| # avoid installing libggml libraries to "lib" since they would conflict with llama.cpp | ||
| system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args(install_libdir: "libinternal") | ||
| if head? |
There was a problem hiding this comment.
Suggested change
| if head? | |
| if build.head? |
Comment on lines
+43
to
+49
| (bin/"whisper-cpp").write <<~EOS | ||
| #!/bin/bash | ||
| here="${BASH_SOURCE[0]}" | ||
| echo "${BASH_SOURCE[0]}: warning: whisper-cpp is deprecated. Use whisper-cli instead." >&2 | ||
| exec "$(dirname "$here")/whisper-cli" "$@" | ||
| EOS | ||
| (bin/"whisper-cpp").chmod 0755 |
There was a problem hiding this comment.
We should probably do this unconditionally?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is to accommodate the build system changes in the upcoming v1.7.4 release.
HOMEBREW_NO_INSTALL_FROM_API=1 brew install --build-from-source <formula>, where<formula>is the name of the formula you're submitting?brew test <formula>, where<formula>is the name of the formula you're submitting?brew audit --strict <formula>(after doingHOMEBREW_NO_INSTALL_FROM_API=1 brew install --build-from-source <formula>)? If this is a new formula, does it passbrew audit --new <formula>?In
--HEADmode, the main changes are that dylibs are now enabled and that the main binary is now calledwhisper-cli.Libraries and header files currently unfortunately conflict with the
llama.cppformula, so in this installation we rename the "lib" folder and omit the header files to avoid the conflict. ggerganov/ggml#1050 (comment)