chunzhi/comfyui-deploy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: turn perf meta into array

Browse Source
This commit is contained in:
bennykok 2024-12-09 18:42:15 +08:00
parent f39d216326
commit ac843527d9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
custom_routes.py
View File

@ -1125,7 +1125,7 @@ async def proxy_to_comfydeploy(request):
prompt_server = server.PromptServer.instance prompt_server = server.PromptServer.instance
NODE_EXECUTION_TIMES = OrderedDict() # New dictionary to store node execution times NODE_EXECUTION_TIMES = {} # New dictionary to store node execution times
CURRENT_START_EXECUTION_DATA = None CURRENT_START_EXECUTION_DATA = None
def get_peak_memory(): def get_peak_memory():
@ -1231,7 +1231,7 @@ def swizzle_send_sync(self, event, data, sid=None):
global CURRENT_START_EXECUTION_DATA global CURRENT_START_EXECUTION_DATA
if event == "execution_start": if event == "execution_start":
global NODE_EXECUTION_TIMES global NODE_EXECUTION_TIMES
NODE_EXECUTION_TIMES = OrderedDict() # Reset execution times at start NODE_EXECUTION_TIMES = {} # Reset execution times at start
CURRENT_START_EXECUTION_DATA = dict( CURRENT_START_EXECUTION_DATA = dict(
start_perf_time=time.perf_counter(), start_perf_time=time.perf_counter(),
nodes_start_perf_time={}, nodes_start_perf_time={},
@ -1294,6 +1294,8 @@ async def send_json_override(self, event, data, sid=None):
# Replace the print statements with tabulate # Replace the print statements with tabulate
headers = ["Node ID", "Type", "Time (s)", "VRAM (GB)"] headers = ["Node ID", "Type", "Time (s)", "VRAM (GB)"]
table_data = [] table_data = []
node_execution_array = [] # New array to store execution data
for node_id, node_data in NODE_EXECUTION_TIMES.items(): for node_id, node_data in NODE_EXECUTION_TIMES.items():
vram_gb = node_data['vram_used'] / (1024**3) # Convert bytes to GB vram_gb = node_data['vram_used'] / (1024**3) # Convert bytes to GB
table_data.append([ table_data.append([
@ -1303,6 +1305,12 @@ async def send_json_override(self, event, data, sid=None):
f"{vram_gb:.2f}" f"{vram_gb:.2f}"
]) ])
# Add to our new array format
node_execution_array.append({
"id": node_id,
**node_data,
})
# Add total execution time as the last row # Add total execution time as the last row
table_data.append([ table_data.append([
"TOTAL", "TOTAL",
@ -1314,9 +1322,11 @@ async def send_json_override(self, event, data, sid=None):
prompt_id = data.get("prompt_id") prompt_id = data.get("prompt_id")
await update_run_with_output( await update_run_with_output(
prompt_id, prompt_id,
NODE_EXECUTION_TIMES, node_execution_array, # Send the array instead of the OrderedDict
) )
print(node_execution_array)
# print("\n=== Node Execution Times ===") # print("\n=== Node Execution Times ===")
logger.info("Printing Node Execution Times") logger.info("Printing Node Execution Times")
logger.info(format_table(headers, table_data)) logger.info(format_table(headers, table_data))