EBROOT* env vars aren't set in parse hooks

trz42 · Jun 11, 2024 · 278ae61 · 278ae61
1 parent ce92a6a
commit 278ae61
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/eb_hooks.py b/eb_hooks.py
@@ -308,10 +308,12 @@ def parse_hook_pytorch_bundle_torchvision_setenv(ec, eprefix):
             print_msg("parse_hook for PyTorch-bundle without CUDA: extslist '%s'", ec['exts_list'])
             print_msg("New exts_list: '%s'", ec['exts_list'])
             ec_dict = ec.asdict()
-            libpng_root = os.getenv('EBROOTLIBPNG')
+            cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
+            eessi_software_path = get_eessi_envvar('EESSI_SOFTWARE_PATH')
+            libpng_root = os.path.join(eessi_software_path, "software", "libpng", "1.6.39-GCCcore-12.3.0")
             libpng_include = os.path.join(libpng_root, 'include')
             libpng_lib = os.path.join(libpng_root, 'lib')
-            libjpeg_turbo_root = os.getenv('EBROOTLIBJPEGMINTURBO')
+            libjpeg_turbo_root = os.path.join(eessi_software_path, "software", "libjpeg-turbo", "2.1.5.1-GCCcore-12.3.0")
             libjpeg_turbo_include = os.path.join(libjpeg_turbo_root, 'include')
             libjpeg_turbo_lib = os.path.join(libjpeg_turbo_root, 'lib')
             exts_list_new = []