-
Notifications
You must be signed in to change notification settings - Fork 61
Also check the EasyBuild hooks when checking missing installations, restrict the CUDA license hook to only trigger under specific conditions #1075
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
Conversation
Instance
|
Instance
|
Instance
|
Instance
|
Instance
|
Ha, that's good, #1074 was merged while the CI here was running, so it does indeed work, see https://github.com/EESSI/software-layer/actions/runs/14855477571/job/41707688661?pr=1075 |
Avoids ``` fatal: origin/2023.06-software.eessi.io...HEAD: no merge base ```
@ocaisa What needs to happen here to make CI happy? |
An upstream PR has overwritten the hooks (so it has caught exactly what it was meant to catch). Ingesting any PR that updates the hook will fix the problem. I have a couple of different updates to the hooks that I want to make, I'll do the simplest one now and add it to this PR |
@boegel This now solves the issue seen in https://gitlab.com/eessi/support/-/issues/116#note_2440400281 |
bot: build repo:eessi.io-2023.06-software instance:eessi-bot-mc-aws arch:x86_64/amd/zen2 |
Updates by the bot instance
|
Updates by the bot instance
|
Updates by the bot instance
|
Updates by the bot instance
|
New job on instance
|
@@ -965,52 +965,56 @@ def post_postproc_cuda(self, *args, **kwargs): | |||
Remove files from CUDA installation that we are not allowed to ship, | |||
and replace them with a symlink to a corresponding installation under host_injections. | |||
""" | |||
if self.name == 'CUDA': |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change here is actually quite minimal. The previous condition was
if self.name == 'CUDA' and eessi_installation:
which meant that when someone tried to install CUDA but wasn't doing an EESSI installation you would (incorrectly) get the EasyBuildError
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change works as expected (tested using EESSI-extend
):
ocaisa@~/EESSI/software-layer(hooks_check)$ module list
Currently Loaded Modules:
1) EESSI/2023.06 2) EasyBuild/5.0.0 3) EESSI-extend/2023.06-easybuild
ocaisa@~/EESSI/software-layer(hooks_check)$ eb CUDA-12.1.1.eb --rebuild --accept-eula-for=CUDA --hooks=eb_hooks.py
...
== Running post-postproc hook...
== EESSI hook to respect CUDA license not triggered for installation path /home/ocaisa/eessi/versions/2023.06/software/linux/x86_64/intel/skylake_avx512/software/CUDA/12.1.1
Nice, this also works for us on x86-64/zen4. Thanks! |
Label |
staging PR merged... |
@boegel Ingested and CI passing now |
fb040d6
into
EESSI:2023.06-software.eessi.io
PR merged! Moved |
@ocaisa The updated CI workflow may need a follow-up here, since the post-merge run of the modified CI workflow failed with:
see https://github.com/EESSI/software-layer/actions/runs/15139304479/job/42558788609 |
No description provided.