Merge branch 'fix-rich' into 'reschedule-dataloaders' (60788743) · Commits · ExaDigiT / sim-raps

main.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ sc = Engine(
		cooling_model=cooling_model,
		**args_dict,
		)
		layout_manager = LayoutManager(args.layout, engine=sc, debug=args.debug, **config)

		timestep_start = 0
		if args.fastforward:
		@@ -159,7 +158,9 @@ if args.plot or args.output:
		if args.verbose:
		print(jobs)

		print(f'Simulating {len(jobs)} jobs for {timestep_end - timestep_start} seconds')
		total_timesteps = timestep_end - timestep_start
		print(f'Simulating {len(jobs)} jobs for {total_timesteps} seconds')
		layout_manager = LayoutManager(args.layout, engine=sc, debug=args.debug, total_timesteps=total_timesteps, **config)
		layout_manager.run(jobs, timestep_start=timestep_start, timestep_end=timestep_end)

		engine_stats = get_engine_stats(sc)

raps/ui.py

+47 −24

Original line number	Diff line number	Diff line
		@@ -4,13 +4,16 @@ from rich.console import Console
		from rich.layout import Layout
		from rich.panel import Panel
		from rich.table import Table
		from rich.live import Live
		from rich.progress import Progress,TextColumn,BarColumn,TaskProgressColumn,TimeRemainingColumn, track, TimeElapsedColumn, MofNCompleteColumn

		from .utils import summarize_ranges, convert_seconds
		from .constants import ELLIPSES
		from .engine import TickData, Engine


		class LayoutManager:
		def __init__(self, layout_type, engine: Engine, debug, **config):
		def __init__(self, layout_type, engine: Engine, total_timesteps=0, debug=None, **config):
		self.engine = engine
		self.config = config
		self.console = Console()
		@@ -22,20 +25,32 @@ class LayoutManager:
		self.racks_per_cdu = self.config['RACKS_PER_CDU']
		self.power_column = self.power_df_header[self.racks_per_cdu + 1]
		self.loss_column = self.power_df_header[-1]
		self.progress = Progress(
		TextColumn("Progress: [progress.percentage]{task.percentage:>3.0f}%"),
		BarColumn(bar_width=None),
		TextColumn("•"),
		MofNCompleteColumn(),
		TextColumn("•"),
		TimeElapsedColumn(),
		TextColumn("•"),
		TimeRemainingColumn()
		)
		self.progress_task = self.progress.add_task("Progress",total=total_timesteps, name="Progress")

		def setup_layout(self, layout_type):
		self.layout.split_column(Layout(name="main"),Layout(name="progress",size=1))
		if layout_type == "layout2":
		self.layout.split_row(Layout(name="left", ratio=3), Layout(name="right", ratio=2))
		self.layout["left"].split_column(
		self.layout["main"].split_row(Layout(name="left", ratio=3), Layout(name="right", ratio=2))
		self.layout["main"]["left"].split_column(
		Layout(name="pressflow", ratio=6),
		Layout(name="powertemp", ratio=11),
		Layout(name="totpower", ratio=3),
		)
		self.layout["right"].split(Layout(name="scheduled", ratio=17), Layout(name="status", ratio=3))
		self.layout["main"]["right"].split(Layout(name="scheduled", ratio=17), Layout(name="status", ratio=3))
		else:
		self.layout.split_row(Layout(name="left", ratio=1), Layout(name="right", ratio=1))
		self.layout["left"].split_column(Layout(name="upper", ratio=8), Layout(name="lower", ratio=2))
		self.layout["right"].split_column(Layout(name="scheduled", ratio=8), Layout(name="status", ratio=2))
		self.layout["main"].split_row(Layout(name="left", ratio=1), Layout(name="right", ratio=1))
		self.layout["main"]["left"].split_column(Layout(name="upper", ratio=8), Layout(name="lower", ratio=2))
		self.layout["main"]["right"].split_column(Layout(name="scheduled", ratio=8), Layout(name="status", ratio=2))

		def create_table(self, title, columns, header_style="bold green"):
		"""
		@@ -373,9 +388,14 @@ class LayoutManager:

		self.layout["lower"].update(Panel(Align(total_table, align="center"), title="Power and Performance"))

		def update_progress(self, timestamp):
		self.progress.update(self.progress_task, description=f"{timestamp}",advance=timestamp,transient=True)
		self.layout["progress"].update(self.progress.get_renderable())

		def update(self, data: TickData):
		uncertainties = self.engine.power_manager.uncertainties

		if data.current_time % self.config['UI_UPDATE_FREQ'] == 0:
		if self.engine.cooling_model:
		self.update_powertemp_array(
		data.power_df, data.fmu_outputs, data.p_flops, data.g_flops_w, data.system_util,
		@@ -392,6 +412,10 @@ class LayoutManager:
		data.power_df, data.p_flops, data.g_flops_w,
		data.system_util, uncertainties=uncertainties,
		)
		if False:
		self.render()
		self.update_progress(1)


		def render(self):
		if not self.debug:
		@@ -400,10 +424,9 @@ class LayoutManager:

		def run(self, jobs, timestep_start, timestep_end):
		""" Runs the UI, blocking until the simulation is complete """
		with Live(self.layout, refresh_per_second=5):
		for data in self.engine.run_simulation(jobs, timestep_start, timestep_end):
		if data.current_time % self.config['UI_UPDATE_FREQ'] == 0:
		self.update(data)
		self.render()

		def run_stepwise(self, jobs, timestep_start, timestep_end):
		""" Prepares the UI and returns a generator for the simulation """