hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show time per phase (#33874)

Browse source
This commit is contained in:
Harmen Stoppels 2022-11-15 21:10:07 +01:00 committed by GitHub
parent 4ecb6ecaff
commit a0182c069f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/spack/spack/installer.py
View file

@ -279,11 +279,10 @@ def _print_installed_pkg(message):
print(colorize("@*g{[+]} ") + spack.util.path.debug_padded_filter(message)) print(colorize("@*g{[+]} ") + spack.util.path.debug_padded_filter(message))
def _print_timer(pre, pkg_id, fetch, build, total): def _print_timer(pre, pkg_id, timer):
tty.msg( phases = ["{}: {}.".format(p.capitalize(), _hms(timer.duration(p))) for p in timer.phases]
"{0} Successfully installed {1}".format(pre, pkg_id), phases.append("Total: {}".format(_hms(timer.duration())))
"Fetch: {0}. Build: {1}. Total: {2}.".format(_hms(fetch), _hms(build), _hms(total)), tty.msg("{0} Successfully installed {1}".format(pre, pkg_id), " ".join(phases))
)
def _install_from_cache(pkg, cache_only, explicit, unsigned=False): def _install_from_cache(pkg, cache_only, explicit, unsigned=False):
@ -316,13 +315,7 @@ def _install_from_cache(pkg, cache_only, explicit, unsigned=False):
return False return False
t.stop() t.stop()
tty.debug("Successfully extracted {0} from binary cache".format(pkg_id)) tty.debug("Successfully extracted {0} from binary cache".format(pkg_id))
_print_timer( _print_timer(pre=_log_prefix(pkg.name), pkg_id=pkg_id, timer=t)
pre=_log_prefix(pkg.name),
pkg_id=pkg_id,
fetch=t.duration("search") + t.duration("fetch"),
build=t.duration("install"),
total=t.duration(),
)
_print_installed_pkg(pkg.spec.prefix) _print_installed_pkg(pkg.spec.prefix)
spack.hooks.post_install(pkg.spec) spack.hooks.post_install(pkg.spec)
return True return True
@ -1918,12 +1911,16 @@ def __init__(self, pkg, install_args):
def run(self): def run(self):
"""Main entry point from ``build_process`` to kick off install in child.""" """Main entry point from ``build_process`` to kick off install in child."""
self.timer.start("stage")
if not self.fake: if not self.fake:
if not self.skip_patch: if not self.skip_patch:
self.pkg.do_patch() self.pkg.do_patch()
else: else:
self.pkg.do_stage() self.pkg.do_stage()
self.timer.stop("stage")
tty.debug( tty.debug(
"{0} Building {1} [{2}]".format(self.pre, self.pkg_id, self.pkg.build_system_class) "{0} Building {1} [{2}]".format(self.pre, self.pkg_id, self.pkg.build_system_class)
) )
@ -1958,9 +1955,7 @@ def run(self):
_print_timer( _print_timer(
pre=self.pre, pre=self.pre,
pkg_id=self.pkg_id, pkg_id=self.pkg_id,
fetch=self.pkg._fetch_time, timer=self.timer,
build=self.timer.duration() - self.pkg._fetch_time,
total=self.timer.duration(),
) )
_print_installed_pkg(self.pkg.prefix) _print_installed_pkg(self.pkg.prefix)

2
lib/spack/spack/test/install.py
View file

@ -252,7 +252,7 @@ def test_install_times(install_mockery, mock_fetch, mutable_mock_repo):
# The order should be maintained # The order should be maintained
phases = [x["name"] for x in times["phases"]] phases = [x["name"] for x in times["phases"]]
assert phases == ["one", "two", "three", "install"] assert phases == ["stage", "one", "two", "three", "install"]
assert all(isinstance(x["seconds"], float) for x in times["phases"]) assert all(isinstance(x["seconds"], float) for x in times["phases"])