From ee1535ae438857d1de2d99ec45fedbeb7259e9b6 Mon Sep 17 00:00:00 2001
From: linan17 <linan17@baidu.com>
Date: Thu, 2 Jan 2020 19:45:00 +0800
Subject: [PATCH] add ssd table and fix parse content bug

Change-Id: I534f116439c493accfd937114a6d35b37f782485
---
 paddle/fluid/framework/data_set.cc                          | 1 +
 .../fluid/incubate/fleet/parameter_server/pslib/node.py     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 paddle/fluid/framework/data_set.cc
 mode change 100644 => 100755 python/paddle/fluid/incubate/fleet/parameter_server/pslib/node.py

diff --git a/paddle/fluid/framework/data_set.cc b/paddle/fluid/framework/data_set.cc
old mode 100644
new mode 100755
index 541b3fed..471db585
--- a/paddle/fluid/framework/data_set.cc
+++ b/paddle/fluid/framework/data_set.cc
@@ -561,6 +561,7 @@ void DatasetImpl<T>::CreatePreLoadReaders() {
     preload_readers_[i]->SetFileListIndex(&file_idx_);
     preload_readers_[i]->SetFileList(filelist_);
     preload_readers_[i]->SetParseInsId(parse_ins_id_);
+    preload_readers_[i]->SetParseContent(parse_content_);
     preload_readers_[i]->SetInputChannel(input_channel_.get());
     preload_readers_[i]->SetOutputChannel(nullptr);
     preload_readers_[i]->SetConsumeChannel(nullptr);
diff --git a/python/paddle/fluid/incubate/fleet/parameter_server/pslib/node.py b/python/paddle/fluid/incubate/fleet/parameter_server/pslib/node.py
old mode 100644
new mode 100755
index d6e744bf..136b337d
--- a/python/paddle/fluid/incubate/fleet/parameter_server/pslib/node.py
+++ b/python/paddle/fluid/incubate/fleet/parameter_server/pslib/node.py
@@ -81,19 +81,19 @@ class DownpourServer(Server):
             if key not in support_sparse_key_list:
                 raise ValueError("strategy key '%s' not support" % (key))
 
-        support_table_calss = ['DownpourSparseTable']
+        support_table_calss = ['DownpourSparseTable', 'DownpourSparseSSDTable']
         if strategy.get('sparse_table_class') is not None:
             table_class = strategy.get('sparse_table_class')
             if table_class not in support_table_calss:
                 raise ValueError(
-                    "support sparse_table_class: [ 'DownpourSparseTable' ], \
+                    "support sparse_table_class: [ 'DownpourSparseTable' , 'DownpourSparseSSDTable'], \
                         but actual %s" % (table_class))
         else:
             table_class = 'DownpourSparseTable'
 
         table.table_class = table_class
 
-        if table_class == 'DownpourSparseTable':
+        if table_class in support_table_calss:
             table.compress_in_save = strategy.get('sparse_compress_in_save',
                                                   True)
             table.shard_num = strategy.get('sparse_shard_num', 1000)
-- 
GitLab