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.

Sign up for GitHub

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

Jump to bottom

{2023.06}[foss/2023a] dask v2023.9.2 #481

Merged
merged 7 commits into from
Mar 1, 2024
Merged

{2023.06}[foss/2023a] dask v2023.9.2 #481

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
793e9f8
{2023.06}[foss/2023a] dask v2023.9.2
Feb 28, 2024
68a766f
fixed info
Feb 28, 2024
3cdf803
removed the hook and added --from-pr
Feb 28, 2024
d7ae0de
Merge branch '2023.06-software.eessi.io' of gh-nessi:EESSI/software-l…
Feb 29, 2024
cf77056
remove-blanks
TopRichard Feb 29, 2024
887e102
Update easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-20…
ocaisa Feb 29, 2024
938e52e
Update easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-20…
ocaisa Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ easyconfigs:
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/19554
options:
from-pr: 19554
- dask-2023.9.2-foss-2023a.eb
14 changes: 14 additions & 0 deletions eb_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,19 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
raise EasyBuildError("OpenBLAS-specific hook triggered for non-OpenBLAS easyconfig?!")


def parse_hook_Pillow_SIMD_harcoded_paths(ec, eprefix):
TopRichard marked this conversation as resolved.
Show resolved Hide resolved
"""Make Pillow-SIMD aware of sysroot."""
# patch setup.py to prefix hardcoded /usr/* and /lib paths with value of %(sysroot) template
# (which will be empty if EasyBuild is not configured to use an alternate sysroot);
# see also https://gitlab.com/eessi/support/-/issues/9
if ec.name == 'Pillow-SIMD':
ec.update('preinstallopts', """sed -i 's@"/usr/@"%(sysroot)s/usr/@g' setup.py && """)
ec.update('preinstallopts', """sed -i 's@"/lib@"%(sysroot)s/lib@g' setup.py && """)
print_msg("Using custom configure options for %s: %s", ec.name, ec['preinstallopts'])
else:
raise EasyBuildError("Pillow-SIMD-specific hook triggered for non-Pillow-SIMD easyconfig?!")


def parse_hook_pybind11_replace_catch2(ec, eprefix):
"""
Replace Catch2 build dependency in pybind11 easyconfigs with one that doesn't use system toolchain.
Expand Down Expand Up @@ -582,6 +595,7 @@ def inject_gpu_property(ec):
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
'Pillow-SIMD' : parse_hook_Pillow_SIMD_harcoded_paths,
'pybind11': parse_hook_pybind11_replace_catch2,
'Qt5': parse_hook_qt5_check_qtwebengine_disable,
'UCX': parse_hook_ucx_eprefix,
Expand Down
Loading