Move sim shortcuts (6699940d) · Commits · ExaDigiT / sim-raps

raps/run_sim.py

+4 −21

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ from raps.stats import (
		print_formatted_report
		)

		from raps.sim_config import SingleSimConfig, MultiPartSimConfig
		from raps.sim_config import SingleSimConfig, MultiPartSimConfig, SIM_SHORTCUTS


		def read_yaml(config_file: str):
		@@ -34,23 +34,6 @@ def read_yaml(config_file: str):
		return {}


		shortcuts = {
		"partitions": "x",
		"cooling": "c",
		"simulate-network": "net",
		"fastforward": "ff",
		"time": "t",
		"debug": "d",
		"numjobs": "n",
		"verbose": "v",
		"output": "o",
		"uncertainties": "u",
		"plot": "p",
		"replay": "f",
		"workload": "w",
		}


		def run_sim_add_parser(subparsers: SubParsers):
		parser = subparsers.add_parser("run", description="""
		Run single-partition (homogeneous) systems. Supports synthetic workload generation or
		@@ -63,7 +46,7 @@ def run_sim_add_parser(subparsers: SubParsers):
		flags. Pass "-" to read from stdin.
		""")
		model_validate = pydantic_add_args(parser, SingleSimConfig, model_config={
		"cli_shortcuts": shortcuts,
		"cli_shortcuts": SIM_SHORTCUTS,
		})
		parser.set_defaults(
		impl=lambda args: run_sim(model_validate(args, read_yaml(args.config_file)))
		@@ -238,7 +221,7 @@ def run_parts_sim_add_parser(subparsers: SubParsers):
		flags. Pass "-" to read from stdin.
		""")
		model_validate = pydantic_add_args(parser, MultiPartSimConfig, model_config={
		"cli_shortcuts": shortcuts,
		"cli_shortcuts": SIM_SHORTCUTS,
		})
		parser.set_defaults(
		impl=lambda args: run_parts_sim(model_validate(args, read_yaml(args.config_file)))
		@@ -325,7 +308,7 @@ def show_add_parser(subparsers: SubParsers):
		If true, include defaults in the output YAML
		""")
		model_validate = pydantic_add_args(parser, SingleSimConfig, model_config={
		"cli_shortcuts": shortcuts,
		"cli_shortcuts": SIM_SHORTCUTS,
		})

		def impl(args):

raps/sim_config.py

+17 −0

Original line number	Diff line number	Diff line
		@@ -391,3 +391,20 @@ class MultiPartSimConfig(SimConfig):
		@cached_property
		def _multi_partition_system_config(self):
		return get_partition_configs(self.partitions)


		SIM_SHORTCUTS = {
		"partitions": "x",
		"cooling": "c",
		"simulate-network": "net",
		"fastforward": "ff",
		"time": "t",
		"debug": "d",
		"numjobs": "n",
		"verbose": "v",
		"output": "o",
		"uncertainties": "u",
		"plot": "p",
		"replay": "f",
		"workload": "w",
		}

raps/workload.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -952,7 +952,7 @@ def plot_job_hist(jobs, config=None, dist_split=None, gantt_nodes=False):


		def run_workload_add_parser(subparsers: SubParsers):
		from raps.run_sim import shortcuts
		from raps.sim_config import SIM_SHORTCUTS
		# TODO: Separate the arguments for this command
		parser = subparsers.add_parser("workload", description="""
		Saves workload as a snapshot.
		@@ -962,7 +962,7 @@ def run_workload_add_parser(subparsers: SubParsers):
		flags. Pass "-" to read from stdin.
		""")
		model_validate = pydantic_add_args(parser, SingleSimConfig, model_config={
		"cli_shortcuts": shortcuts,
		"cli_shortcuts": SIM_SHORTCUTS,
		})
		parser.set_defaults(impl=lambda args: run_workload(model_validate(args, {})))

Admin message