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

Check for apple,arm-platform in /proc #730

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Check for apple,arm-platform in /proc #730

merged 1 commit into from
Feb 4, 2025

Conversation

ericcurtin
Copy link
Collaborator

@ericcurtin ericcurtin commented Feb 4, 2025

In /proc/device-tree/compatible specifically, thanks Asahi Lina!

It's more portable accross Fedora Asahi Remix and Ubuntu Asahi
Remix.

Also added env var to container image.

Co-authored-by: Asahi Lina [email protected]
Co-authored-by: Daniel J Walsh [email protected]

@ericcurtin
Copy link
Collaborator Author

ericcurtin commented Feb 4, 2025

Copy link
Contributor

sourcery-ai bot commented Feb 4, 2025

Reviewer's Guide by Sourcery

This pull request modifies the get_gpu function to check for the "asahi" string in /proc/cmdline instead of /etc/os-release to improve portability across Fedora Asahi Remix and Ubuntu Asahi Remix.

Sequence diagram for updated GPU detection process

sequenceDiagram
    participant App
    participant get_gpu
    participant FileSystem

    App->>get_gpu: Check GPU
    get_gpu->>FileSystem: Check /proc/cmdline exists
    alt File exists
        FileSystem-->>get_gpu: Yes
        get_gpu->>FileSystem: Read /proc/cmdline
        FileSystem-->>get_gpu: File contents
        alt Contains 'asahi'
            get_gpu->>get_gpu: Set ASAHI_VISIBLE_DEVICES=1
        end
    end
    get_gpu-->>App: Return
Loading

File-Level Changes

Change Details Files
Modified the get_gpu function to check for the "asahi" string in /proc/cmdline instead of /etc/os-release.
  • Replaced the check for /etc/os-release with a check for /proc/cmdline.
  • Updated the file read to use /proc/cmdline instead of /etc/os-release.
  • Ensured the code still correctly sets the ASAHI_VISIBLE_DEVICES environment variable when "asahi" is found.
ramalama/common.py

Possibly linked issues


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 @ericcurtin - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Using /proc/cmdline to detect Asahi Linux is less reliable than checking /etc/os-release. The kernel command line is an implementation detail that could change, while /etc/os-release is the standard location for OS distribution information. Consider keeping the original check or implementing both checks if needed.
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 Feb 4, 2025

A better way might be to set an environment variable within the image to identify the image type. One issue with doing it based on command line, is that someone could launch service on a different container based on the asahi container.

Lets change the containerfiles to set the GPU type as an environment variable.

ENV ASAHI_VISIBLE_DEVICES 1

During the build, then during the run, there is no issue.

@ericcurtin ericcurtin force-pushed the asahi-check branch 2 times, most recently from e01cb9f to d908dd2 Compare February 4, 2025 12:18
@ericcurtin ericcurtin changed the title Check for the asahi string in /proc/cmdline Check for apple,arm-platform in /proc Feb 4, 2025
@ericcurtin
Copy link
Collaborator Author

A better way might be to set an environment variable within the image to identify the image type. One issue with doing it based on command line, is that someone could launch service on a different container based on the asahi container.

Lets change the containerfiles to set the GPU type as an environment variable.

ENV ASAHI_VISIBLE_DEVICES 1

During the build, then during the run, there is no issue.

Added

In /proc/device-tree/compatible specifically, thanks Asahi Lina!

It's more portable accross Fedora Asahi Remix and Ubuntu Asahi
Remix.

Also added env var to container image.

Co-authored-by: Asahi Lina <[email protected]>
Co-authored-by: Daniel J Walsh <[email protected]>
Signed-off-by: Eric Curtin <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Feb 4, 2025

I don't fully understand what is going on here, but this does look like an improvement over what we had before. I trust the asahi people will test.

@rhatdan rhatdan merged commit 319f386 into main Feb 4, 2025
10 of 13 checks passed
@chrootchad
Copy link

#526 (comment)
The fantastic tooling you have here & specifically the first diagram helped me confirm my theory as to what was going wrong (having not had any prior knowledge of the codebase [or python])

@ericcurtin
Copy link
Collaborator Author

#526 (comment) The fantastic tooling you have here & specifically the first diagram helped me confirm my theory as to what was going wrong (having not had any prior knowledge of the codebase [or python])

Yeah sometimes the diagrams are quite cool, I don't always take them for granted though. They are AI generated at the end of the day.

@ericcurtin ericcurtin deleted the asahi-check branch February 4, 2025 13:25
@ericcurtin
Copy link
Collaborator Author

ericcurtin commented Feb 4, 2025

I don't fully understand what is going on here, but this does look like an improvement over what we had before. I trust the asahi people will test.

if we ignore the env var for a second. It's because we need a way of detecting we are running on Asahi to download the Asahi container image. I initially put in a way that was only compatible with Fedora Asahi Remix. The new way is more portable and can detect we need to pull the Asahi container image on Ubuntu Asahi Remix.

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.

3 participants