@@ -1661,7 +1661,6 @@ def install_extensions_sequential(self, install=True):
1661
1661
self .log .info ("Installing extensions sequentially..." )
1662
1662
1663
1663
exts_cnt = len (self .ext_instances )
1664
- start_progress_bar (PROGRESS_BAR_EXTENSIONS , exts_cnt )
1665
1664
1666
1665
for idx , ext in enumerate (self .ext_instances ):
1667
1666
@@ -1670,7 +1669,7 @@ def install_extensions_sequential(self, install=True):
1670
1669
# always go back to original work dir to avoid running stuff from a dir that no longer exists
1671
1670
change_dir (self .orig_workdir )
1672
1671
1673
- progress_label = "Installing '%s' extension" % ext .name
1672
+ progress_label = "Installing '%s' extension (%s/%s) " % ( ext .name , idx + 1 , exts_cnt )
1674
1673
update_progress_bar (PROGRESS_BAR_EXTENSIONS , label = progress_label )
1675
1674
1676
1675
tup = (ext .name , ext .version or '' , idx + 1 , exts_cnt )
@@ -1711,8 +1710,6 @@ def install_extensions_sequential(self, install=True):
1711
1710
elif self .logdebug or build_option ('trace' ):
1712
1711
print_msg ("\t ... (took < 1 sec)" , log = self .log , silent = self .silent )
1713
1712
1714
- stop_progress_bar (PROGRESS_BAR_EXTENSIONS , visible = False )
1715
-
1716
1713
def install_extensions_parallel (self , install = True ):
1717
1714
"""
1718
1715
Install extensions in parallel.
@@ -1734,8 +1731,6 @@ def install_extensions_parallel(self, install=True):
1734
1731
exts_cnt = len (all_ext_names )
1735
1732
exts_queue = self .ext_instances [:]
1736
1733
1737
- start_progress_bar (PROGRESS_BAR_EXTENSIONS , exts_cnt )
1738
-
1739
1734
def update_exts_progress_bar (running_exts , progress_size ):
1740
1735
"""Helper function to update extensions progress bar."""
1741
1736
running_exts_cnt = len (running_exts )
@@ -1747,6 +1742,7 @@ def update_exts_progress_bar(running_exts, progress_size):
1747
1742
progress_label = "Not installing extensions (yet)"
1748
1743
1749
1744
progress_label += ' ' .join (e .name for e in running_exts )
1745
+ progress_label += "(%d/%d done)" % (len (installed_ext_names ), exts_cnt )
1750
1746
update_progress_bar (PROGRESS_BAR_EXTENSIONS , label = progress_label , progress_size = progress_size )
1751
1747
1752
1748
iter_id = 0
@@ -1831,8 +1827,6 @@ def update_exts_progress_bar(running_exts, progress_size):
1831
1827
self .log .info ("Started installation of extension %s in the background..." , ext .name )
1832
1828
update_exts_progress_bar (running_exts , 0 )
1833
1829
1834
- stop_progress_bar (PROGRESS_BAR_EXTENSIONS , visible = False )
1835
-
1836
1830
#
1837
1831
# MISCELLANEOUS UTILITY FUNCTIONS
1838
1832
#
@@ -2587,9 +2581,12 @@ def extensions_step(self, fetch=False, install=True):
2587
2581
2588
2582
fake_mod_data = self .load_fake_module (purge = True , extra_modules = build_dep_mods )
2589
2583
2584
+ start_progress_bar (PROGRESS_BAR_EXTENSIONS , len (self .cfg ['exts_list' ]))
2585
+
2590
2586
self .prepare_for_extensions ()
2591
2587
2592
2588
if fetch :
2589
+ update_progress_bar (PROGRESS_BAR_EXTENSIONS , label = "fetching extension sources/patches" , progress_size = 0 )
2593
2590
self .exts = self .collect_exts_file_info (fetch_files = True )
2594
2591
2595
2592
self .exts_all = self .exts [:] # retain a copy of all extensions, regardless of filtering/skipping
@@ -2603,9 +2600,11 @@ def extensions_step(self, fetch=False, install=True):
2603
2600
self .clean_up_fake_module (fake_mod_data )
2604
2601
raise EasyBuildError ("ERROR: No default extension class set for %s" , self .name )
2605
2602
2603
+ update_progress_bar (PROGRESS_BAR_EXTENSIONS , label = "creating Extension instances" , progress_size = 0 )
2606
2604
self .init_ext_instances ()
2607
2605
2608
2606
if self .skip :
2607
+ update_progress_bar (PROGRESS_BAR_EXTENSIONS , label = "skipping installed extensions" , progress_size = 0 )
2609
2608
self .skip_extensions ()
2610
2609
2611
2610
self .install_extensions (install = install )
@@ -2614,6 +2613,8 @@ def extensions_step(self, fetch=False, install=True):
2614
2613
if fake_mod_data :
2615
2614
self .clean_up_fake_module (fake_mod_data )
2616
2615
2616
+ stop_progress_bar (PROGRESS_BAR_EXTENSIONS , visible = False )
2617
+
2617
2618
def package_step (self ):
2618
2619
"""Package installed software (e.g., into an RPM), if requested, using selected package tool."""
2619
2620
0 commit comments