Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve get_pretty_snapshot_diff(...) message formatting.

Browse Source
This commit is contained in:
Ryan Dick 2023-10-03 11:56:11 -04:00
parent 75b65597af
commit b9fd2e9e76
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
invokeai/backend/model_management/memory_snapshot.py
View File

@ -66,13 +66,30 @@ class MemorySnapshot:
def get_pretty_snapshot_diff(snapshot_1: MemorySnapshot, snapshot_2: MemorySnapshot) -> str: def get_pretty_snapshot_diff(snapshot_1: MemorySnapshot, snapshot_2: MemorySnapshot) -> str:
"""Get a pretty string describing the difference between two `MemorySnapshot`s.""" """Get a pretty string describing the difference between two `MemorySnapshot`s."""
ram_diff = snapshot_2.process_ram - snapshot_1.process_ram
msg = f"RAM ({(ram_diff/GB):+.2f}): {(snapshot_1.process_ram/GB):.2f}GB -> {(snapshot_2.process_ram/GB):.2f}GB"
vram_diff = None def get_msg_line(prefix: str, val1: Optional[int], val2: Optional[int]):
if snapshot_1.vram is not None and snapshot_2.vram is not None: diff = None
vram_diff = snapshot_2.vram - snapshot_1.vram if val1 is not None and val2 is not None:
diff = val2 - val1
return f"{prefix: <30} ({(diff/GB):+5.3f}): {(val1/GB):5.3f}GB -> {(val2/GB):5.3f}GB\n"
msg += f", VRAM ({(vram_diff/GB):+.2f}): {(snapshot_1.vram/GB):.2f}GB -> {(snapshot_2.vram/GB):.2f}GB" msg = ""
return msg msg += get_msg_line("Process RAM", snapshot_1.process_ram, snapshot_2.process_ram)
if snapshot_1.malloc_info is not None and snapshot_2.malloc_info is not None:
msg += get_msg_line("libc mmap allocated", snapshot_1.malloc_info.hblkhd, snapshot_2.malloc_info.hblkhd)
msg += get_msg_line("libc arena used", snapshot_1.malloc_info.uordblks, snapshot_2.malloc_info.uordblks)
msg += get_msg_line("libc arena free", snapshot_1.malloc_info.fordblks, snapshot_2.malloc_info.fordblks)
libc_total_allocated_1 = snapshot_1.malloc_info.arena + snapshot_1.malloc_info.hblkhd
libc_total_allocated_2 = snapshot_2.malloc_info.arena + snapshot_2.malloc_info.hblkhd
msg += get_msg_line("libc total allocated", libc_total_allocated_1, libc_total_allocated_2)
libc_total_used_1 = snapshot_1.malloc_info.uordblks + snapshot_1.malloc_info.hblkhd
libc_total_used_2 = snapshot_2.malloc_info.uordblks + snapshot_2.malloc_info.hblkhd
msg += get_msg_line("libc total used", libc_total_used_1, libc_total_used_2)
msg += get_msg_line("VRAM", snapshot_1.vram, snapshot_2.vram)

18
invokeai/backend/model_management/model_cache.py
View File

@ -230,10 +230,10 @@ class ModelCache(object):
self_reported_model_size_after_load = model_info.get_size(submodel) self_reported_model_size_after_load = model_info.get_size(submodel)
self.logger.debug( self.logger.debug(
f"Moved model '{key}' from disk to cpu in {(end_load_time-start_load_time):.2f}s. Self-reported size" f"Moved model '{key}' from disk to cpu in {(end_load_time-start_load_time):.2f}s.\n"
f" before/after load: {(self_reported_model_size_before_load/GIG):.2f}GB /" f"Self-reported size before/after load: {(self_reported_model_size_before_load/GIG):.2f}GB /"
f" {(self_reported_model_size_after_load/GIG):.2f}GB." f" {(self_reported_model_size_after_load/GIG):.2f}GB.\n"
f" {get_pretty_snapshot_diff(snapshot_before, snapshot_after)}." f"{get_pretty_snapshot_diff(snapshot_before, snapshot_after)}"
) )
# We only log a warning for over-reported (not under-reported) model sizes before load. There is a known # We only log a warning for over-reported (not under-reported) model sizes before load. There is a known
@ -282,9 +282,9 @@ class ModelCache(object):
end_model_to_time = time.time() end_model_to_time = time.time()
self.logger.debug( self.logger.debug(
f"Moved model '{key}' from {source_device} to" f"Moved model '{key}' from {source_device} to"
f" {target_device} in {(end_model_to_time-start_model_to_time):.2f}s." f" {target_device} in {(end_model_to_time-start_model_to_time):.2f}s.\n"
f" Estimated model size: {(cache_entry.size/GIG):.2f} GB." f"Estimated model size: {(cache_entry.size/GIG):.2f} GB.\n"
f" {get_pretty_snapshot_diff(snapshot_before, snapshot_after)}." f"{get_pretty_snapshot_diff(snapshot_before, snapshot_after)}"
) )
if snapshot_before.vram is not None and snapshot_after.vram is not None: if snapshot_before.vram is not None and snapshot_after.vram is not None:
@ -301,8 +301,8 @@ class ModelCache(object):
f"Moving model '{key}' from {source_device} to" f"Moving model '{key}' from {source_device} to"
f" {target_device} caused an unexpected change in VRAM usage. The model's" f" {target_device} caused an unexpected change in VRAM usage. The model's"
" estimated size may be incorrect. Estimated model size:" " estimated size may be incorrect. Estimated model size:"
f" {(cache_entry.size/GIG):.2f} GB." f" {(cache_entry.size/GIG):.2f} GB.\n"
f" {get_pretty_snapshot_diff(snapshot_before, snapshot_after)}." f"{get_pretty_snapshot_diff(snapshot_before, snapshot_after)}"
) )
# Now, we will update our size estimate for `cache_entry` based on the change in VRAM usage. We only use the # Now, we will update our size estimate for `cache_entry` based on the change in VRAM usage. We only use the