diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh index 195239b9eb..423746ae03 100755 --- a/EESSI-install-software.sh +++ b/EESSI-install-software.sh @@ -251,9 +251,9 @@ fi # Install extra software that is needed (e.g., for providing a custom ctypes # library when needed) -#cd ${TOPDIR}/scripts/extra -#./install_extra_packages.sh --temp-dir /tmp/temp --easystack eessi-2023.06-extra-packages.yml -#cd ${TOPDIR} +cd ${TOPDIR}/scripts/extra +./install_extra_packages.sh --temp-dir /tmp/temp --easystack eessi-2023.06-extra-packages.yml +cd ${TOPDIR} # use PR patch file to determine in which easystack files stuff was added changed_easystacks=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^easystacks/.*yml$' | egrep -v 'known-issues|missing') diff --git a/eb_hooks.py b/eb_hooks.py index 413675a60f..84bd4fff84 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -782,7 +782,7 @@ def pre_module_hook_librosa_augment_modluafooter(self, *args, **kwargs): 'CGAL': parse_hook_cgal_toolchainopts_precise, 'fontconfig': parse_hook_fontconfig_add_fonts, 'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64, - #'librosa': parse_hook_librosa_custom_ctypes, + 'librosa': parse_hook_librosa_custom_ctypes, 'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors, 'pybind11': parse_hook_pybind11_replace_catch2, #'PyTorch-bundle': parse_hook_pytorch_bundle_torchvision_setenv, @@ -833,5 +833,5 @@ def pre_module_hook_librosa_augment_modluafooter(self, *args, **kwargs): } PRE_MODULE_HOOKS = { - #'librosa': pre_module_hook_librosa_augment_modluafooter, + 'librosa': pre_module_hook_librosa_augment_modluafooter, }