Skip to content

Conversation

mikebonnet
Copy link
Collaborator

@mikebonnet mikebonnet commented Sep 10, 2025

Updating the version of llama.cpp also updated convert_hf_to_gguf.py, which introduced a new dependency on mistral-common.

Update the minimum version of sentencepiece to 0.2.1 to fix compilation with gcc 15.

Summary by Sourcery

Update build_rag.sh to install the new mistral-common dependency for convert_hf_to_gguf.py and to bump sentencepiece to 0.2.1, removing the GCC 15 workaround.

Enhancements:

  • Add mistral-common>=1.8.3 to the to_gguf pip install list
  • Bump minimum sentencepiece version to 0.2.1
  • Remove the CXXFLAGS workaround for GCC 15

Updating the version of llama.cpp also updated convert_hf_to_gguf.py, which introduced
a new dependency on mistral-common.

Update the minimum version of sentencepiece to 0.2.1 to fix compilation with gcc 15.

Signed-off-by: Mike Bonnet <[email protected]>
Copy link
Contributor

sourcery-ai bot commented Sep 10, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

The build_rag.sh script’s to_gguf function was updated to remove the temporary GCC 15 workaround, bump sentencepiece to ≥0.2.1, and add mistral-common as a new dependency, with pip install arguments reformatted for readability.

Flow diagram for updated dependency installation in to_gguf()

flowchart TD
    A["Start to_gguf()"] --> B["Install numpy~=1.26.4"]
    B --> C["Install sentencepiece~=0.2.1"]
    C --> D["Install transformers>=4.45.1,<5.0.0"]
    D --> E["Install gguf-py from llama.cpp repo"]
    E --> F["Install protobuf>=5.27.2,<6.0.0"]
    F --> G["Install mistral-common>=1.8.3"]
    G --> H["End to_gguf()"]
Loading

File-Level Changes

Change Details Files
Remove GCC 15 compilation hack
  • Deleted export of CXXFLAGS with cstdint inclusion
  • Removed accompanying comment about GCC 15 and sentencepiece issue
container-images/scripts/build_rag.sh
Bump minimum sentencepiece version
  • Updated sentencepiece requirement from ~=0.2.0 to ~=0.2.1
container-images/scripts/build_rag.sh
Add mistral-common dependency
  • Appended “mistral-common>=1.8.3” to pip install command
container-images/scripts/build_rag.sh
Reformat pip install invocation
  • Split pip install arguments across multiple lines for clarity
container-images/scripts/build_rag.sh

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!

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

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @mikebonnet, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request updates the build script for RAG components to ensure compatibility with recent changes in llama.cpp. It addresses new dependency requirements and resolves a compilation issue related to sentencepiece, streamlining the build process.

Highlights

  • New Dependency for convert_hf_to_gguf.py: The mistral-common package (version 1.8.3 or higher) is now installed as a new dependency. This is required by the updated convert_hf_to_gguf.py script from llama.cpp.
  • sentencepiece Version Update: The minimum version of sentencepiece has been updated from 0.2.0 to 0.2.1. This change addresses a compilation issue with GCC 15.
  • Removed GCC 15 Workaround: The export CXXFLAGS="-include cstdint" line, which was a temporary workaround for GCC 15 compilation issues with sentencepiece, has been removed as it's no longer needed after the sentencepiece version update.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

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 there - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `container-images/scripts/build_rag.sh:67` </location>
<code_context>
-    ${python} -m pip install "numpy~=1.26.4" "sentencepiece~=0.2.0" "transformers>=4.45.1,<5.0.0" git+https://github.com/ggml-org/llama.cpp#subdirectory=gguf-py "protobuf>=5.27.2,<6.0.0"
+    ${python} -m pip install "numpy~=1.26.4" "sentencepiece~=0.2.1" "transformers>=4.45.1,<5.0.0" \
+              "git+https://github.com/ggml-org/llama.cpp#subdirectory=gguf-py" \
+              "protobuf>=5.27.2,<6.0.0" "mistral-common>=1.8.3"
 }

</code_context>

<issue_to_address>
Consider pinning mistral-common to a specific version for reproducibility.

Pinning the version or specifying a tighter range will help prevent future incompatibilities and ensure consistent builds.
</issue_to_address>

<suggested_fix>
<<<<<<< SEARCH
    ${python} -m pip install "numpy~=1.26.4" "sentencepiece~=0.2.1" "transformers>=4.45.1,<5.0.0" \
              "git+https://github.com/ggml-org/llama.cpp#subdirectory=gguf-py" \
              "protobuf>=5.27.2,<6.0.0" "mistral-common>=1.8.3"
=======
    ${python} -m pip install "numpy~=1.26.4" "sentencepiece~=0.2.1" "transformers>=4.45.1,<5.0.0" \
              "git+https://github.com/ggml-org/llama.cpp#subdirectory=gguf-py" \
              "protobuf>=5.27.2,<6.0.0" "mistral-common==1.8.3"
>>>>>>> REPLACE

</suggested_fix>

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.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request updates Python dependencies for the GGUF conversion process. It correctly bumps sentencepiece to version 0.2.1 to resolve a compilation issue with GCC 15, removing a previous workaround. It also adds mistral-common as a new dependency required by an updated llama.cpp. My main feedback is to pin the llama.cpp dependency to a specific commit hash to ensure build reproducibility and stability, as installing directly from the main branch can lead to unexpected issues. This is a general best practice for managing dependencies from version control systems.

@rhatdan
Copy link
Member

rhatdan commented Sep 10, 2025

LGTM

@mikebonnet mikebonnet merged commit f1f3618 into main Sep 10, 2025
38 of 54 checks passed
@mikebonnet mikebonnet deleted the rag-mistral branch September 10, 2025 17:45
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