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

Install llama.cpp for mac and nocontainer tests #792

Merged
merged 1 commit into from
Feb 12, 2025

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Feb 12, 2025

Summary by Sourcery

Install llama.cpp for macOS and non-containerized environments to enable running tests in those environments.

CI:

  • Install llama.cpp using Homebrew on macOS and Linux runners.

Tests:

  • Remove conditional skips for macOS and non-containerized environments in system tests.

Copy link
Contributor

sourcery-ai bot commented Feb 12, 2025

Reviewer's Guide by Sourcery

This PR introduces modifications to the CI workflows and system tests to install llama.cpp on mac systems and in nocontainer environments. It updates the installation steps in the CI configuration to include llama.cpp via brew and removes test skips to allow llama.cpp related tests to run on darwin.

No diagrams generated as the changes look simple and do not need a visual representation.

File-Level Changes

Change Details Files
CI workflow modifications to install llama.cpp using brew.
  • Added 'brew' to the package installation list in the CI workflow.
  • Inserted a command to install llama.cpp using brew to set up the environment correctly.
  • Updated the golang installation command to include llama.cpp.
.github/workflows/ci.yml
System test update to remove environment-specific skips.
  • Removed skip conditions for nocontainer and darwin environments in the test for 'ramalama run --keepalive'.
test/system/030-run.bats

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @rhatdan - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider using a separate job for macOS-specific steps to improve clarity.
  • It's great that you're enabling tests on macOS, but please remove the skip_if_darwin calls in a separate commit.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@rhatdan rhatdan force-pushed the keepalive branch 10 times, most recently from cdc1381 to 294e21b Compare February 12, 2025 12:02
make install-requirements
git clone https://github.com/ggerganov/llama.cpp
cd llama.cpp
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend doing something like:

container-images/scripts/build_llama_and_whisper.sh build

and introduce this "build" or similar argument to build_llama_and_whisper.sh .

Keeping everything on the same version of llama.cpp will help avoid flakey builds.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at that but the script was pretty focused on dnf install commands, which will not work on Ubuntu.

Lets get this in and then we ca work towards that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, as a follow-on:

It's pretty easy to avoid the dnf stuff in that script, if dnf doesn't exist, don't execute that part

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rhatdan rhatdan merged commit 5bf0e81 into containers:main Feb 12, 2025
8 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants