From 53b6f16a37a7b625aa5ed4a6914958130519d220 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 10 Jun 2020 21:21:56 +0800 Subject: [PATCH] fix windows adapter --- core/model.py | 6 +++--- core/trainers/framework/network.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/model.py b/core/model.py index 036de7d6..75324d40 100755 --- a/core/model.py +++ b/core/model.py @@ -37,7 +37,7 @@ class ModelBase(object): self._fetch_interval = 20 self._platform = envs.get_platform() self._init_hyper_parameters() - self._env = config + context["env"] = config self._slot_inited = False def _init_hyper_parameters(self): @@ -49,11 +49,11 @@ class ModelBase(object): self._slot_inited = True dataset = {} model_dict = {} - for i in self._env("phase"): + for i in context["env"]("phase"): if i["name"] == kargs["name"]: model_dict = i break - for i in self._env("dataset"): + for i in context["env"]("dataset"): if i["name"] == model_dict["dataset_name"]: dataset = i break diff --git a/core/trainers/framework/network.py b/core/trainers/framework/network.py index 30b73b20..7d1e276e 100644 --- a/core/trainers/framework/network.py +++ b/core/trainers/framework/network.py @@ -96,7 +96,7 @@ class SingleNetwork(NetworkBase): "default_main_program"] = train_program.clone() context["dataset"] = {} - for dataset in self._env["dataset"]: + for dataset in context["env"]["dataset"]: if dataset["type"] != "DataLoader": dataset_class = QueueDataset(context) context["dataset"][dataset[ @@ -113,12 +113,12 @@ class PSNetwork(NetworkBase): def build_network(self, context): context["model"] = {} - if len(self._env["phase"]) > 1: + if len(context["env"]["phase"]) > 1: warnings.warn( "Cluster Train Only Support One Phase.", category=UserWarning, stacklevel=2) - model_dict = self._env["phase"][0] + model_dict = context["env"]["phase"][0] context["model"][model_dict["name"]] = {} dataset_name = model_dict["dataset_name"] @@ -154,7 +154,7 @@ class PSNetwork(NetworkBase): else: context["fleet"].init_worker() context["dataset"] = {} - for dataset in self._env["dataset"]: + for dataset in context["env"]["dataset"]: if dataset["type"] != "DataLoader": dataset_class = QueueDataset(context) context["dataset"][dataset[ @@ -200,12 +200,12 @@ class PslibNetwork(NetworkBase): def build_network(self, context): context["model"] = {} - if len(self._env["phase"]) > 1: + if len(context["env"]["phase"]) > 1: warnings.warn( "Cluster Train Only Support One Phase.", category=UserWarning, stacklevel=2) - model_dict = self._env["phase"][0] + model_dict = context["env"]["phase"][0] train_program = fluid.Program() startup_program = fluid.Program() scope = fluid.Scope() @@ -247,7 +247,7 @@ class PslibNetwork(NetworkBase): self._server(context) else: context["dataset"] = {} - for dataset in self._env["dataset"]: + for dataset in context["env"]["dataset"]: if dataset["type"] != "DataLoader": dataset_class = QueueDataset(context) context["dataset"][dataset[ @@ -267,12 +267,12 @@ class CollectiveNetwork(NetworkBase): def build_network(self, context): context["model"] = {} - if len(self._env["phase"]) > 1: + if len(context["env"]["phase"]) > 1: warnings.warn( "Cluster Train Only Support One Phase.", category=UserWarning, stacklevel=2) - model_dict = self._env["phase"][0] + model_dict = context["env"]["phase"][0] context["model"][model_dict["name"]] = {} dataset_name = model_dict["dataset_name"] @@ -311,7 +311,7 @@ class CollectiveNetwork(NetworkBase): "default_main_program"] = train_program context["dataset"] = {} - for dataset in self._env["dataset"]: + for dataset in context["env"]["dataset"]: if dataset["type"] != "DataLoader": dataset_class = QueueDataset(context) context["dataset"][dataset[ -- GitLab