From 88880d9b6901ee018caf6fc69b7619b138e221ef Mon Sep 17 00:00:00 2001
From: dongdaxiang <dongdaxiang@baidu.com>
Date: Thu, 28 Mar 2019 15:17:26 +0800
Subject: [PATCH] fix import trainer_desc_pb2 error test=develop

---
 paddle/fluid/framework/trainer_desc.proto | 2 +-
 python/paddle/fluid/trainer_desc.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/paddle/fluid/framework/trainer_desc.proto b/paddle/fluid/framework/trainer_desc.proto
index 6dbce6a02..389c1a870 100644
--- a/paddle/fluid/framework/trainer_desc.proto
+++ b/paddle/fluid/framework/trainer_desc.proto
@@ -39,7 +39,7 @@ message TrainerDesc {
   optional DataFeedDesc data_desc = 201;
 }
 
-message HogwildWorkerParameter {}
+message HogwildWorkerParameter { repeated string skip_ops = 1; }
 
 message DownpourWorkerParameter {
   repeated TableParameter sparse_table = 1;
diff --git a/python/paddle/fluid/trainer_desc.py b/python/paddle/fluid/trainer_desc.py
index 70b511dd7..5a19907ab 100644
--- a/python/paddle/fluid/trainer_desc.py
+++ b/python/paddle/fluid/trainer_desc.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from proto import trainer_desc_pb2
+from proto import trainer_desc_pb2 as trainer_desc_pb2
 from distributed import ps_pb2 as ps_pb2
 from device_worker import DeviceWorkerFactory
 from google.protobuf import text_format
-- 
GitLab