Commit e9f76266 authored by Brewer, Wes's avatar Brewer, Wes
Browse files

Fix to ensure `--out none` doesn't output network plot files

parent dba096f0
Loading
Loading
Loading
Loading
+14 −9
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ class NetworkModel:
    def __init__(self, *, available_nodes, config, **kwargs):
        self.config = config
        self.output_dir = kwargs.get('output_dir')
        if self.output_dir:
            self.output_dir.mkdir(parents=True, exist_ok=True)
        self.topology = config.get("TOPOLOGY")
        self.max_link_bw = config.get("NETWORK_MAX_BW", 1e9)  # default safeguard
@@ -54,7 +55,9 @@ class NetworkModel:
            total_nodes = config['TOTAL_NODES'] - len(config['DOWN_NODES'])
            self.fattree_k = config.get("FATTREE_K")
            self.net_graph = build_fattree(self.fattree_k, total_nodes)
            # TODO: future testing of subsampling feature
            #self.net_graph = subsample_hosts(self.net_graph, num_hosts=4626)
            if self.output_dir:
                save_path = os.path.join(self.output_dir, "net-fat-tree.png")
                plot_fattree_hierarchy(self.net_graph, k=self.fattree_k, save_path=save_path)

@@ -70,6 +73,7 @@ class NetworkModel:
            # Build the graph and metadata
            self.net_graph, self.meta = build_torus3d(dims, wrap, hosts_per_router=hosts_per_router)

            if self.output_dir:
                save_path = os.path.join(self.output_dir, "net-torus2d.png")
                plot_torus2d(self.net_graph, save_path=save_path)
                save_path = os.path.join(self.output_dir, "net-torus3d.png")
@@ -105,6 +109,7 @@ class NetworkModel:
            self.real_to_fat_idx = build_dragonfly_idx_map(D, A, P, total_real_nodes)
            print(f"[DEBUG] Dragonfly mapping: {len(self.real_to_fat_idx)} entries")

            if self.output_dir:
                save_path = os.path.join(self.output_dir, "net-dragonfly.png")
                plot_dragonfly(self.net_graph, save_path=save_path)