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

Only do dnf install for cuda images #441

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Conversation

ericcurtin
Copy link
Collaborator

@ericcurtin ericcurtin commented Nov 11, 2024

Should fix container build for Vulkan images

Summary by Sourcery

Enhancements:

  • Modify the dnf_install function to conditionally install packages only for CUDA images, avoiding unnecessary installations for Vulkan images.

Copy link
Contributor

sourcery-ai bot commented Nov 11, 2024

Reviewer's Guide by Sourcery

The PR modifies the container build script to only perform DNF package installation for CUDA images, removing the default case that was installing packages unnecessarily for Vulkan images. This change is implemented through a modification of the conditional logic in the dnf_install function.

Sequence diagram for dnf_install function logic

sequenceDiagram
    participant Script
    participant DNF
    Script->>DNF: Check containerfile type
    alt containerfile is rocm
        Script->>DNF: dnf install rocm-dev hipblas-devel rocblas-devel
    else containerfile is cuda
        Script->>DNF: dnf install rpm_list
    else containerfile is Vulkan
        Script->>DNF: No installation, rebuild with -DGGML_VULKAN
    end
Loading

File-Level Changes

Change Details Files
Modified package installation logic to exclude Vulkan images from DNF installation
  • Changed else clause to elif specifically for cuda container type
  • Added comment explaining that Vulkan images only need -DGGML_VULKAN flag
  • Removed default package installation case that was affecting Vulkan images
container-images/scripts/build_llama_and_whisper.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.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a 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. You can also use
    this command to specify where the summary should be inserted.

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

Should fix container build for Vulkan images

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
@ericcurtin ericcurtin force-pushed the fix-vulkan-container-image-build branch from d0d5504 to 89236dc Compare November 11, 2024 14:01
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 @ericcurtin - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Please provide a more detailed commit message explaining why Vulkan images don't need additional packages installed and how this fixes the container build.
  • There's a typo in the PR description: 'Shoudl' should be 'Should'
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
Copy link
Member

rhatdan commented Nov 11, 2024

LGTM

@rhatdan rhatdan merged commit 76afd2d into main Nov 11, 2024
12 checks passed
@ericcurtin ericcurtin deleted the fix-vulkan-container-image-build branch November 11, 2024 16:06
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