diff --git a/taccl/routing.py b/taccl/routing.py index c2d6789..22a1922 100644 --- a/taccl/routing.py +++ b/taccl/routing.py @@ -151,7 +151,7 @@ def _encode(self, opt): if self.topology.copies > 1: self._add_relay_relaxation(opt, SND) - if self.route_sketch.internode.enforce_ordering: + if self.route_sketch.internode is not None and self.route_sketch.internode.enforce_ordering: self._enforce_ordering(opt) self._add_symmetry(opt, L) diff --git a/taccl/topologies/generic.py b/taccl/topologies/generic.py index 5791bfd..abd2412 100644 --- a/taccl/topologies/generic.py +++ b/taccl/topologies/generic.py @@ -41,14 +41,18 @@ def validate_and_modify_topo(topo_json, check_links=True): topo_json["nics_per_node"] = -1 topo_json["remote_alpha"] = -1 topo_json["remote_beta"] = -1 - topo_json["remote_invbws"] = -1 + topo_json["remote_invbw"] = -1 return topo_json def custom(topo_file): - topo_json = json.load(topo_file) + print("topo_file:", topo_file) + f = open(topo_file, "r") + topo_json = json.load(f) topo_json = validate_and_modify_topo(topo_json, check_links=True) gpus_per_node = topo_json["gpus_per_node"] links = topo_json["links"] + alpha = topo_json["alpha"] + betas = topo_json["betas"] invbws = topo_json["invbws"] nics_per_node = topo_json["nics_per_node"] remote_invbw = topo_json["remote_invbw"]