-
Notifications
You must be signed in to change notification settings - Fork 306
enhance CUDA easyblock to create version independent pkgconfig files #2656
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
as some distros do and as expected by some packages (eg: xpra)
|
Test report by @SebastianAchilles Overview of tested easyconfigs (in order)
Build succeeded for 4 out of 4 (4 easyconfigs in total) |
easybuild/easyblocks/c/cuda.py
Outdated
| # See e.g. https://github.com/Xpra-org/xpra/blob/master/setup.py#L206 | ||
| # Distros provide these files, so let's do it here too | ||
| pkgconfig_dir = os.path.join(self.installdir, 'pkgconfig') | ||
| pc_files = expand_glob_paths([os.path.join(pkgconfig_dir, '*.pc')]) |
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 doesn't always work apparently, fails with CUDA 10.1.105 because there are no pkgconfig files included at all:
No files found using glob pattern
'/user/gent/400/vsc40023/eb_arcaninescratch/CO7/skylake-ib/software/CUDA/10.1.105-GCC-8.2.0-2.31.1/pkgconfig/*.pc`
So this should be guarded with:
if os.path.exists(pkgconfig_dir):@damianam Does that make sense to you?
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.
None of the 10.x versions we have installed have a pkgconfig dir. So it's clearly needed
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.
Also the module generation needs to have this protected. Don't add nonexisting paths to PKG_CONFIG_PATH
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.
Makes sense. Update coming
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.
I pushed an update to address that. Note that I readded some of the pc files in the sanity check list. That's because those files are explicitly checked by other tools (and actually nvjpeg.pc is the whole reason for this PR), so I guess it makes sense to add them. Or are they not present in older CUDA releases?
|
Test report by @SebastianAchilles Overview of tested easyconfigs (in order)
Build succeeded for 3 out of 18 (18 easyconfigs in total) |
|
Test report by @boegel Overview of tested easyconfigs (in order)
Build succeeded for 5 out of 7 (7 easyconfigs in total) |
|
Test report by @SebastianAchilles Overview of tested easyconfigs (in order)
Build succeeded for 4 out of 18 (18 easyconfigs in total) |
…o dict returns by make_module_req_guess in CUDA easyblock
|
Test report by @boegel Overview of tested easyconfigs (in order)
Build succeeded for 7 out of 7 (7 easyconfigs in total) |
|
Test report by @boegel Overview of tested easyconfigs (in order)
Build succeeded for 3 out of 3 (3 easyconfigs in total) |
as some distros do and as expected by some packages (eg: xpra)