未验证 提交 995a6376 编写于 作者: Y yaoxuefeng 提交者: GitHub

add pslib SparseDoubleTable test=develop (#23053)

上级 3af47711
...@@ -81,25 +81,25 @@ class DownpourServer(Server): ...@@ -81,25 +81,25 @@ class DownpourServer(Server):
'sparse_delete_after_unseen_days', 'sparse_show_click_decay_rate', 'sparse_delete_threshold', \ 'sparse_delete_after_unseen_days', 'sparse_show_click_decay_rate', 'sparse_delete_threshold', \
'sparse_converter', 'sparse_deconverter', 'sparse_enable_cache', 'sparse_cache_rate', \ 'sparse_converter', 'sparse_deconverter', 'sparse_enable_cache', 'sparse_cache_rate', \
'sparse_cache_file_num', 'sparse_beta1_decay_rate', 'sparse_beta2_decay_rate', \ 'sparse_cache_file_num', 'sparse_beta1_decay_rate', 'sparse_beta2_decay_rate', \
'sparse_ada_epsilon', 'sparse_optimizer'] 'sparse_ada_epsilon', 'sparse_optimizer', 'sparse_ssd_unseenday_threshold']
for key in strategy: for key in strategy:
if key not in support_sparse_key_list: if key not in support_sparse_key_list:
raise ValueError("strategy key '%s' not support" % (key)) 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: if strategy.get('sparse_table_class') is not None:
table_class = strategy.get('sparse_table_class') table_class = strategy.get('sparse_table_class')
if table_class not in support_table_calss: if table_class not in support_table_calss:
raise ValueError( raise ValueError(
"support sparse_table_class: [ 'DownpourSparseTable' ], \ "support sparse_table_class: [ 'DownpourSparseTable', 'DownpourSparseSSDTable'], \
but actual %s" % (table_class)) but actual %s" % (table_class))
else: else:
table_class = 'DownpourSparseTable' table_class = 'DownpourSparseTable'
table.table_class = table_class table.table_class = table_class
if table_class == 'DownpourSparseTable': if table_class == 'DownpourSparseTable' or table_class == 'DownpourSparseSSDTable':
table.enable_sparse_table_cache = strategy.get( table.enable_sparse_table_cache = strategy.get(
'sparse_enable_cache', True) 'sparse_enable_cache', True)
table.sparse_table_cache_rate = strategy.get('sparse_cache_rate', table.sparse_table_cache_rate = strategy.get('sparse_cache_rate',
...@@ -112,23 +112,25 @@ class DownpourServer(Server): ...@@ -112,23 +112,25 @@ class DownpourServer(Server):
# DownpourFeatureValueAccessor: for ctr task, has cvm, embedding and sgd info # DownpourFeatureValueAccessor: for ctr task, has cvm, embedding and sgd info
# DownpourCtrAccessor : for ctr task, has cvm, slot, embedding and sgd info # DownpourCtrAccessor : for ctr task, has cvm, slot, embedding and sgd info
# DownpourSparseValueAccessor : for general task, has embedding and sgd info # DownpourSparseValueAccessor : for general task, has embedding and sgd info
# DownpourCtrDoubleAccessor : for ctr task, which show clk are in double
support_accessor_class = [ support_accessor_class = [
'DownpourFeatureValueAccessor', 'DownpourCtrAccessor', 'DownpourFeatureValueAccessor', 'DownpourCtrAccessor',
'DownpourSparseValueAccessor' 'DownpourSparseValueAccessor', 'DownpourCtrDoubleAccessor'
] ]
if strategy.get('sparse_accessor_class') is not None: if strategy.get('sparse_accessor_class') is not None:
accessor_class = strategy.get('sparse_accessor_class') accessor_class = strategy.get('sparse_accessor_class')
if accessor_class not in support_accessor_class: if accessor_class not in support_accessor_class:
raise ValueError( raise ValueError(
"support sparse_accessor_class: ['DownpourFeatureValueAccessor', 'DownpourCtrAccessor'], \ "support sparse_accessor_class: ['DownpourFeatureValueAccessor', 'DownpourCtrAccessor', \
'DownpourSparseValueAccessor', 'DownpourCtrDoubleAccessor'], \
but actual %s" % (accessor_class)) but actual %s" % (accessor_class))
else: else:
accessor_class = 'DownpourCtrAccessor' accessor_class = 'DownpourCtrAccessor'
table.accessor.accessor_class = accessor_class table.accessor.accessor_class = accessor_class
if accessor_class == 'DownpourFeatureValueAccessor' or accessor_class == 'DownpourCtrAccessor': if accessor_class == 'DownpourFeatureValueAccessor' or accessor_class == 'DownpourCtrAccessor' or accessor_class == 'DownpourCtrDoubleAccessor':
table.accessor.sparse_sgd_param.learning_rate = strategy.get( table.accessor.sparse_sgd_param.learning_rate = strategy.get(
'sparse_learning_rate', 0.05) 'sparse_learning_rate', 0.05)
table.accessor.sparse_sgd_param.initial_g2sum = strategy.get( table.accessor.sparse_sgd_param.initial_g2sum = strategy.get(
...@@ -157,6 +159,8 @@ class DownpourServer(Server): ...@@ -157,6 +159,8 @@ class DownpourServer(Server):
'sparse_delta_keep_days', 16) 'sparse_delta_keep_days', 16)
table.accessor.downpour_accessor_param.delete_after_unseen_days = strategy.get( table.accessor.downpour_accessor_param.delete_after_unseen_days = strategy.get(
'sparse_delete_after_unseen_days', 30) 'sparse_delete_after_unseen_days', 30)
table.accessor.downpour_accessor_param.ssd_unseenday_threshold = strategy.get(
'sparse_ssd_unseenday_threshold', 1)
table.accessor.downpour_accessor_param.show_click_decay_rate = strategy.get( table.accessor.downpour_accessor_param.show_click_decay_rate = strategy.get(
'sparse_show_click_decay_rate', 0.98) 'sparse_show_click_decay_rate', 0.98)
table.accessor.downpour_accessor_param.delete_threshold = strategy.get( table.accessor.downpour_accessor_param.delete_threshold = strategy.get(
......
...@@ -32,7 +32,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( ...@@ -32,7 +32,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
package='paddle', package='paddle',
syntax='proto2', syntax='proto2',
serialized_pb=_b( serialized_pb=_b(
'\n\x08ps.proto\x12\x06paddle\"\x9e\x02\n\x0bPSParameter\x12\x14\n\x0cworker_class\x18\x01 \x01(\t\x12\x14\n\x0cserver_class\x18\x02 \x01(\t\x12\x16\n\x0einstance_class\x18\x03 \x01(\t\x12-\n\x0cworker_param\x18\x65 \x01(\x0b\x32\x17.paddle.WorkerParameter\x12-\n\x0cserver_param\x18\x66 \x01(\x0b\x32\x17.paddle.ServerParameter\x12\x38\n\rtrainer_param\x18\xad\x02 \x03(\x0b\x32 .paddle.DownpourTrainerParameter\x12\x33\n\x0f\x66s_client_param\x18\xf5\x03 \x01(\x0b\x32\x19.paddle.FsClientParameter\"Q\n\x0fWorkerParameter\x12>\n\x15\x64ownpour_worker_param\x18\x01 \x01(\x0b\x32\x1f.paddle.DownpourWorkerParameter\"Q\n\x0fServerParameter\x12>\n\x15\x64ownpour_server_param\x18\x01 \x01(\x0b\x32\x1f.paddle.DownpourServerParameter\"O\n\x17\x44ownpourWorkerParameter\x12\x34\n\x14\x64ownpour_table_param\x18\x01 \x03(\x0b\x32\x16.paddle.TableParameter\"\xfd\x01\n\x18\x44ownpourTrainerParameter\x12\x30\n\x0b\x64\x65nse_table\x18\x01 \x03(\x0b\x32\x1b.paddle.DenseTableParameter\x12\x32\n\x0csparse_table\x18\x02 \x03(\x0b\x32\x1c.paddle.SparseTableParameter\x12\x1d\n\x15push_sparse_per_batch\x18\x03 \x01(\x05\x12\x1c\n\x14push_dense_per_batch\x18\x04 \x01(\x05\x12\x0f\n\x07skip_op\x18\x05 \x03(\t\x12-\n\x0eprogram_config\x18\x06 \x03(\x0b\x32\x15.paddle.ProgramConfig\"\x99\x01\n\rProgramConfig\x12\x12\n\nprogram_id\x18\x01 \x02(\t\x12\x1c\n\x14push_sparse_table_id\x18\x02 \x03(\x05\x12\x1b\n\x13push_dense_table_id\x18\x03 \x03(\x05\x12\x1c\n\x14pull_sparse_table_id\x18\x04 \x03(\x05\x12\x1b\n\x13pull_dense_table_id\x18\x05 \x03(\x05\"{\n\x13\x44\x65nseTableParameter\x12\x10\n\x08table_id\x18\x01 \x01(\x05\x12\x1b\n\x13\x64\x65nse_variable_name\x18\x02 \x03(\t\x12$\n\x1c\x64\x65nse_gradient_variable_name\x18\x03 \x03(\t\x12\x0f\n\x07\x66\x65\x61_dim\x18\x04 \x01(\x05\"z\n\x14SparseTableParameter\x12\x10\n\x08table_id\x18\x01 \x01(\x05\x12\x13\n\x0b\x66\x65\x61ture_dim\x18\x02 \x01(\x05\x12\x10\n\x08slot_key\x18\x03 \x03(\t\x12\x12\n\nslot_value\x18\x04 \x03(\t\x12\x15\n\rslot_gradient\x18\x05 \x03(\t\"\x86\x01\n\x17\x44ownpourServerParameter\x12\x34\n\x14\x64ownpour_table_param\x18\x01 \x03(\x0b\x32\x16.paddle.TableParameter\x12\x35\n\rservice_param\x18\x02 \x01(\x0b\x32\x1e.paddle.ServerServiceParameter\"\xd7\x01\n\x16ServerServiceParameter\x12*\n\x0cserver_class\x18\x01 \x01(\t:\x14\x44ownpourBrpcPsServer\x12*\n\x0c\x63lient_class\x18\x02 \x01(\t:\x14\x44ownpourBrpcPsClient\x12(\n\rservice_class\x18\x03 \x01(\t:\x11\x44ownpourPsService\x12\x1c\n\x11start_server_port\x18\x04 \x01(\r:\x01\x30\x12\x1d\n\x11server_thread_num\x18\x05 \x01(\r:\x02\x31\x32\"\xc0\x02\n\x0eTableParameter\x12\x10\n\x08table_id\x18\x01 \x01(\x04\x12\x13\n\x0btable_class\x18\x02 \x01(\t\x12\x17\n\tshard_num\x18\x03 \x01(\x04:\x04\x31\x30\x30\x30\x12\x30\n\x08\x61\x63\x63\x65ssor\x18\x04 \x01(\x0b\x32\x1e.paddle.TableAccessorParameter\x12\x1f\n\x04type\x18\x05 \x01(\x0e\x32\x11.paddle.TableType\x12\x1f\n\x10\x63ompress_in_save\x18\x06 \x01(\x08:\x05\x66\x61lse\x12\'\n\x19\x65nable_sparse_table_cache\x18\x07 \x01(\x08:\x04true\x12(\n\x17sparse_table_cache_rate\x18\x08 \x01(\x01:\x07\x30.00055\x12\'\n\x1bsparse_table_cache_file_num\x18\t \x01(\r:\x02\x31\x36\"\xc2\x03\n\x16TableAccessorParameter\x12\x16\n\x0e\x61\x63\x63\x65ssor_class\x18\x01 \x01(\t\x12\x38\n\x10sparse_sgd_param\x18\x02 \x01(\x0b\x32\x1e.paddle.SparseSGDRuleParameter\x12\x36\n\x0f\x64\x65nse_sgd_param\x18\x03 \x01(\x0b\x32\x1d.paddle.DenseSGDRuleParameter\x12\x13\n\x07\x66\x65\x61_dim\x18\x04 \x01(\r:\x02\x31\x31\x12\x15\n\nembedx_dim\x18\x05 \x01(\r:\x01\x38\x12\x1c\n\x10\x65mbedx_threshold\x18\x06 \x01(\r:\x02\x31\x30\x12G\n\x17\x64ownpour_accessor_param\x18\x07 \x01(\x0b\x32&.paddle.DownpourTableAccessorParameter\x12\x45\n\x19table_accessor_save_param\x18\x08 \x03(\x0b\x32\".paddle.TableAccessorSaveParameter\x12\x44\n\x16sparse_commonsgd_param\x18\t \x01(\x0b\x32$.paddle.SparseCommonSGDRuleParameter\"\x96\x02\n\x1e\x44ownpourTableAccessorParameter\x12\x19\n\x0cnonclk_coeff\x18\x01 \x01(\x02:\x03\x30.1\x12\x16\n\x0b\x63lick_coeff\x18\x02 \x01(\x02:\x01\x31\x12\x1b\n\x0e\x62\x61se_threshold\x18\x03 \x01(\x02:\x03\x31.5\x12\x1d\n\x0f\x64\x65lta_threshold\x18\x04 \x01(\x02:\x04\x30.25\x12\x1b\n\x0f\x64\x65lta_keep_days\x18\x05 \x01(\x02:\x02\x31\x36\x12#\n\x15show_click_decay_rate\x18\x06 \x01(\x02:\x04\x30.98\x12\x1d\n\x10\x64\x65lete_threshold\x18\x07 \x01(\x02:\x03\x30.8\x12$\n\x18\x64\x65lete_after_unseen_days\x18\x08 \x01(\x02:\x02\x33\x30\"S\n\x1aTableAccessorSaveParameter\x12\r\n\x05param\x18\x01 \x01(\r\x12\x11\n\tconverter\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65\x63onverter\x18\x03 \x01(\t\"e\n\x10PsRequestMessage\x12\x0e\n\x06\x63md_id\x18\x01 \x02(\r\x12\x10\n\x08table_id\x18\x02 \x01(\r\x12\x0e\n\x06params\x18\x03 \x03(\x0c\x12\x11\n\tclient_id\x18\x04 \x01(\x05\x12\x0c\n\x04\x64\x61ta\x18\x05 \x01(\x0c\"\x85\x01\n\x16SparseSGDRuleParameter\x12\x1b\n\rlearning_rate\x18\x01 \x01(\x01:\x04\x30.05\x12\x18\n\rinitial_g2sum\x18\x02 \x01(\x01:\x01\x33\x12\x1d\n\rinitial_range\x18\x03 \x01(\x01:\x06\x30.0001\x12\x15\n\rweight_bounds\x18\x04 \x03(\x02\"\xc6\x01\n\x1cSparseCommonSGDRuleParameter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x32\n\x05naive\x18\x02 \x01(\x0b\x32#.paddle.SparseNaiveSGDRuleParameter\x12\x36\n\x07\x61\x64\x61grad\x18\x03 \x01(\x0b\x32%.paddle.SparseAdagradSGDRuleParameter\x12,\n\x04\x61\x64\x61m\x18\x04 \x01(\x0b\x32\x1e.paddle.SparseAdamSGDParameter\"p\n\x1bSparseNaiveSGDRuleParameter\x12\x1b\n\rlearning_rate\x18\x01 \x01(\x01:\x04\x30.05\x12\x1d\n\rinitial_range\x18\x02 \x01(\x01:\x06\x30.0001\x12\x15\n\rweight_bounds\x18\x03 \x03(\x02\"\x8c\x01\n\x1dSparseAdagradSGDRuleParameter\x12\x1b\n\rlearning_rate\x18\x01 \x01(\x01:\x04\x30.05\x12\x18\n\rinitial_g2sum\x18\x02 \x01(\x01:\x01\x33\x12\x1d\n\rinitial_range\x18\x03 \x01(\x01:\x06\x30.0001\x12\x15\n\rweight_bounds\x18\x04 \x03(\x02\"\xc8\x01\n\x16SparseAdamSGDParameter\x12\x1c\n\rlearning_rate\x18\x01 \x01(\x01:\x05\x30.001\x12\x1d\n\rinitial_range\x18\x02 \x01(\x01:\x06\x30.0001\x12\x1d\n\x10\x62\x65ta1_decay_rate\x18\x03 \x01(\x01:\x03\x30.9\x12\x1f\n\x10\x62\x65ta2_decay_rate\x18\x04 \x01(\x01:\x05\x30.999\x12\x1a\n\x0b\x61\x64\x61_epsilon\x18\x05 \x01(\x01:\x05\x31\x65-08\x12\x15\n\rweight_bounds\x18\x06 \x03(\x02\"\xe1\x01\n\x15\x44\x65nseSGDRuleParameter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12&\n\x04\x61\x64\x61m\x18\x02 \x01(\x0b\x32\x18.paddle.AdamSGDParameter\x12(\n\x05naive\x18\x03 \x01(\x0b\x32\x19.paddle.NaiveSGDParameter\x12,\n\x07summary\x18\x04 \x01(\x0b\x32\x1b.paddle.SummarySGDParameter\x12:\n\x0emoving_average\x18\x05 \x01(\x0b\x32\".paddle.MovingAverageRuleParameter\"\xac\x01\n\x10\x41\x64\x61mSGDParameter\x12\x1c\n\rlearning_rate\x18\x01 \x01(\x01:\x05\x35\x65-06\x12 \n\x0e\x61vg_decay_rate\x18\x02 \x01(\x01:\x08\x30.999993\x12\x1e\n\x0e\x61\x64\x61_decay_rate\x18\x03 \x01(\x01:\x06\x30.9999\x12\x1a\n\x0b\x61\x64\x61_epsilon\x18\x04 \x01(\x01:\x05\x31\x65-08\x12\x1c\n\x0emom_decay_rate\x18\x05 \x01(\x01:\x04\x30.99\"J\n\x11NaiveSGDParameter\x12\x1d\n\rlearning_rate\x18\x01 \x01(\x01:\x06\x30.0002\x12\x16\n\x0e\x61vg_decay_rate\x18\x02 \x01(\x01\";\n\x13SummarySGDParameter\x12$\n\x12summary_decay_rate\x18\x01 \x01(\x01:\x08\x30.999999\".\n\x1aMovingAverageRuleParameter\x12\x10\n\x08momentum\x18\x01 \x01(\x01\"I\n\x11PsResponseMessage\x12\x13\n\x08\x65rr_code\x18\x01 \x02(\x05:\x01\x30\x12\x11\n\x07\x65rr_msg\x18\x02 \x02(\t:\x00\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\xd5\x01\n\x11\x46sClientParameter\x12:\n\x07\x66s_type\x18\x01 \x01(\x0e\x32#.paddle.FsClientParameter.FsApiType:\x04HDFS\x12\x0b\n\x03uri\x18\x02 \x01(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0e\n\x06passwd\x18\x04 \x01(\t\x12\x13\n\x0b\x62uffer_size\x18\x05 \x01(\x05\x12\x12\n\nhadoop_bin\x18\x33 \x01(\t\x12\x10\n\x08\x61\x66s_conf\x18\x65 \x01(\t\"\x1e\n\tFsApiType\x12\x08\n\x04HDFS\x10\x00\x12\x07\n\x03\x41\x46S\x10\x01*4\n\tTableType\x12\x13\n\x0fPS_SPARSE_TABLE\x10\x00\x12\x12\n\x0ePS_DENSE_TABLE\x10\x01*\xa1\x04\n\x07PsCmdID\x12\x17\n\x13PS_PULL_DENSE_TABLE\x10\x00\x12\x17\n\x13PS_PUSH_DENSE_TABLE\x10\x01\x12\x18\n\x14PS_PULL_SPARSE_TABLE\x10\x02\x12\x18\n\x14PS_PUSH_SPARSE_TABLE\x10\x03\x12\x13\n\x0fPS_SHRINK_TABLE\x10\x04\x12\x15\n\x11PS_SAVE_ONE_TABLE\x10\x05\x12\x15\n\x11PS_SAVE_ALL_TABLE\x10\x06\x12\x15\n\x11PS_LOAD_ONE_TABLE\x10\x07\x12\x15\n\x11PS_LOAD_ALL_TABLE\x10\x08\x12\x16\n\x12PS_CLEAR_ONE_TABLE\x10\t\x12\x16\n\x12PS_CLEAR_ALL_TABLE\x10\n\x12\x17\n\x13PS_PUSH_DENSE_PARAM\x10\x0b\x12\x12\n\x0ePS_STOP_SERVER\x10\x0c\x12\x1b\n\x17PS_SAVE_ONE_CACHE_TABLE\x10\r\x12\x1a\n\x16PS_GET_CACHE_THRESHOLD\x10\x0e\x12\x14\n\x10PS_CACHE_SHUFFLE\x10\x0f\x12\x11\n\rPS_COPY_TABLE\x10\x10\x12\x1c\n\x18PS_COPY_TABLE_BY_FEASIGN\x10\x11\x12(\n$PS_PULL_SPARSE_TABLE_WITH_DEPENDENCY\x10\x12\x12(\n$PS_PUSH_SPARSE_TABLE_WITH_DEPENDENCY\x10\x13\x12\x0e\n\nPS_S2S_MSG\x10\x65\x32K\n\tPsService\x12>\n\x07service\x12\x18.paddle.PsRequestMessage\x1a\x19.paddle.PsResponseMessageB\x03\x80\x01\x01' '\n\x08ps.proto\x12\x06paddle\"\xb5\x02\n\x0bPSParameter\x12\x14\n\x0cworker_class\x18\x01 \x01(\t\x12\x14\n\x0cserver_class\x18\x02 \x01(\t\x12\x16\n\x0einstance_class\x18\x03 \x01(\t\x12\x15\n\x0binit_gflags\x18\x04 \x01(\t:\x00\x12-\n\x0cworker_param\x18\x65 \x01(\x0b\x32\x17.paddle.WorkerParameter\x12-\n\x0cserver_param\x18\x66 \x01(\x0b\x32\x17.paddle.ServerParameter\x12\x38\n\rtrainer_param\x18\xad\x02 \x03(\x0b\x32 .paddle.DownpourTrainerParameter\x12\x33\n\x0f\x66s_client_param\x18\xf5\x03 \x01(\x0b\x32\x19.paddle.FsClientParameter\"Q\n\x0fWorkerParameter\x12>\n\x15\x64ownpour_worker_param\x18\x01 \x01(\x0b\x32\x1f.paddle.DownpourWorkerParameter\"Q\n\x0fServerParameter\x12>\n\x15\x64ownpour_server_param\x18\x01 \x01(\x0b\x32\x1f.paddle.DownpourServerParameter\"O\n\x17\x44ownpourWorkerParameter\x12\x34\n\x14\x64ownpour_table_param\x18\x01 \x03(\x0b\x32\x16.paddle.TableParameter\"\xfd\x01\n\x18\x44ownpourTrainerParameter\x12\x30\n\x0b\x64\x65nse_table\x18\x01 \x03(\x0b\x32\x1b.paddle.DenseTableParameter\x12\x32\n\x0csparse_table\x18\x02 \x03(\x0b\x32\x1c.paddle.SparseTableParameter\x12\x1d\n\x15push_sparse_per_batch\x18\x03 \x01(\x05\x12\x1c\n\x14push_dense_per_batch\x18\x04 \x01(\x05\x12\x0f\n\x07skip_op\x18\x05 \x03(\t\x12-\n\x0eprogram_config\x18\x06 \x03(\x0b\x32\x15.paddle.ProgramConfig\"\x99\x01\n\rProgramConfig\x12\x12\n\nprogram_id\x18\x01 \x02(\t\x12\x1c\n\x14push_sparse_table_id\x18\x02 \x03(\x05\x12\x1b\n\x13push_dense_table_id\x18\x03 \x03(\x05\x12\x1c\n\x14pull_sparse_table_id\x18\x04 \x03(\x05\x12\x1b\n\x13pull_dense_table_id\x18\x05 \x03(\x05\"{\n\x13\x44\x65nseTableParameter\x12\x10\n\x08table_id\x18\x01 \x01(\x05\x12\x1b\n\x13\x64\x65nse_variable_name\x18\x02 \x03(\t\x12$\n\x1c\x64\x65nse_gradient_variable_name\x18\x03 \x03(\t\x12\x0f\n\x07\x66\x65\x61_dim\x18\x04 \x01(\x05\"z\n\x14SparseTableParameter\x12\x10\n\x08table_id\x18\x01 \x01(\x05\x12\x13\n\x0b\x66\x65\x61ture_dim\x18\x02 \x01(\x05\x12\x10\n\x08slot_key\x18\x03 \x03(\t\x12\x12\n\nslot_value\x18\x04 \x03(\t\x12\x15\n\rslot_gradient\x18\x05 \x03(\t\"\x86\x01\n\x17\x44ownpourServerParameter\x12\x34\n\x14\x64ownpour_table_param\x18\x01 \x03(\x0b\x32\x16.paddle.TableParameter\x12\x35\n\rservice_param\x18\x02 \x01(\x0b\x32\x1e.paddle.ServerServiceParameter\"\xd7\x01\n\x16ServerServiceParameter\x12*\n\x0cserver_class\x18\x01 \x01(\t:\x14\x44ownpourBrpcPsServer\x12*\n\x0c\x63lient_class\x18\x02 \x01(\t:\x14\x44ownpourBrpcPsClient\x12(\n\rservice_class\x18\x03 \x01(\t:\x11\x44ownpourPsService\x12\x1c\n\x11start_server_port\x18\x04 \x01(\r:\x01\x30\x12\x1d\n\x11server_thread_num\x18\x05 \x01(\r:\x02\x31\x32\"\xc0\x02\n\x0eTableParameter\x12\x10\n\x08table_id\x18\x01 \x01(\x04\x12\x13\n\x0btable_class\x18\x02 \x01(\t\x12\x17\n\tshard_num\x18\x03 \x01(\x04:\x04\x31\x30\x30\x30\x12\x30\n\x08\x61\x63\x63\x65ssor\x18\x04 \x01(\x0b\x32\x1e.paddle.TableAccessorParameter\x12\x1f\n\x04type\x18\x05 \x01(\x0e\x32\x11.paddle.TableType\x12\x1f\n\x10\x63ompress_in_save\x18\x06 \x01(\x08:\x05\x66\x61lse\x12\'\n\x19\x65nable_sparse_table_cache\x18\x07 \x01(\x08:\x04true\x12(\n\x17sparse_table_cache_rate\x18\x08 \x01(\x01:\x07\x30.00055\x12\'\n\x1bsparse_table_cache_file_num\x18\t \x01(\r:\x02\x31\x36\"\xc1\x04\n\x16TableAccessorParameter\x12\x16\n\x0e\x61\x63\x63\x65ssor_class\x18\x01 \x01(\t\x12\x38\n\x10sparse_sgd_param\x18\x02 \x01(\x0b\x32\x1e.paddle.SparseSGDRuleParameter\x12\x36\n\x0f\x64\x65nse_sgd_param\x18\x03 \x01(\x0b\x32\x1d.paddle.DenseSGDRuleParameter\x12\x13\n\x07\x66\x65\x61_dim\x18\x04 \x01(\r:\x02\x31\x31\x12\x15\n\nembedx_dim\x18\x05 \x01(\r:\x01\x38\x12\x1c\n\x10\x65mbedx_threshold\x18\x06 \x01(\r:\x02\x31\x30\x12G\n\x17\x64ownpour_accessor_param\x18\x07 \x01(\x0b\x32&.paddle.DownpourTableAccessorParameter\x12\x45\n\x19table_accessor_save_param\x18\x08 \x03(\x0b\x32\".paddle.TableAccessorSaveParameter\x12\x44\n\x16sparse_commonsgd_param\x18\t \x01(\x0b\x32$.paddle.SparseCommonSGDRuleParameter\x12=\n\x0f\x65mbed_sgd_param\x18\n \x01(\x0b\x32$.paddle.SparseCommonSGDRuleParameter\x12>\n\x10\x65mbedx_sgd_param\x18\x0b \x01(\x0b\x32$.paddle.SparseCommonSGDRuleParameter\"\xba\x02\n\x1e\x44ownpourTableAccessorParameter\x12\x19\n\x0cnonclk_coeff\x18\x01 \x01(\x02:\x03\x30.1\x12\x16\n\x0b\x63lick_coeff\x18\x02 \x01(\x02:\x01\x31\x12\x1b\n\x0e\x62\x61se_threshold\x18\x03 \x01(\x02:\x03\x31.5\x12\x1d\n\x0f\x64\x65lta_threshold\x18\x04 \x01(\x02:\x04\x30.25\x12\x1b\n\x0f\x64\x65lta_keep_days\x18\x05 \x01(\x02:\x02\x31\x36\x12#\n\x15show_click_decay_rate\x18\x06 \x01(\x02:\x04\x30.98\x12\x1d\n\x10\x64\x65lete_threshold\x18\x07 \x01(\x02:\x03\x30.8\x12$\n\x18\x64\x65lete_after_unseen_days\x18\x08 \x01(\x02:\x02\x33\x30\x12\"\n\x17ssd_unseenday_threshold\x18\t \x01(\x05:\x01\x31\"S\n\x1aTableAccessorSaveParameter\x12\r\n\x05param\x18\x01 \x01(\r\x12\x11\n\tconverter\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65\x63onverter\x18\x03 \x01(\t\"e\n\x10PsRequestMessage\x12\x0e\n\x06\x63md_id\x18\x01 \x02(\r\x12\x10\n\x08table_id\x18\x02 \x01(\r\x12\x0e\n\x06params\x18\x03 \x03(\x0c\x12\x11\n\tclient_id\x18\x04 \x01(\x05\x12\x0c\n\x04\x64\x61ta\x18\x05 \x01(\x0c\"\x85\x01\n\x16SparseSGDRuleParameter\x12\x1b\n\rlearning_rate\x18\x01 \x01(\x01:\x04\x30.05\x12\x18\n\rinitial_g2sum\x18\x02 \x01(\x01:\x01\x33\x12\x1d\n\rinitial_range\x18\x03 \x01(\x01:\x06\x30.0001\x12\x15\n\rweight_bounds\x18\x04 \x03(\x02\"\xc6\x01\n\x1cSparseCommonSGDRuleParameter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x32\n\x05naive\x18\x02 \x01(\x0b\x32#.paddle.SparseNaiveSGDRuleParameter\x12\x36\n\x07\x61\x64\x61grad\x18\x03 \x01(\x0b\x32%.paddle.SparseAdagradSGDRuleParameter\x12,\n\x04\x61\x64\x61m\x18\x04 \x01(\x0b\x32\x1e.paddle.SparseAdamSGDParameter\"p\n\x1bSparseNaiveSGDRuleParameter\x12\x1b\n\rlearning_rate\x18\x01 \x01(\x01:\x04\x30.05\x12\x1d\n\rinitial_range\x18\x02 \x01(\x01:\x06\x30.0001\x12\x15\n\rweight_bounds\x18\x03 \x03(\x02\"\x8c\x01\n\x1dSparseAdagradSGDRuleParameter\x12\x1b\n\rlearning_rate\x18\x01 \x01(\x01:\x04\x30.05\x12\x18\n\rinitial_g2sum\x18\x02 \x01(\x01:\x01\x33\x12\x1d\n\rinitial_range\x18\x03 \x01(\x01:\x06\x30.0001\x12\x15\n\rweight_bounds\x18\x04 \x03(\x02\"\xc8\x01\n\x16SparseAdamSGDParameter\x12\x1c\n\rlearning_rate\x18\x01 \x01(\x01:\x05\x30.001\x12\x1d\n\rinitial_range\x18\x02 \x01(\x01:\x06\x30.0001\x12\x1d\n\x10\x62\x65ta1_decay_rate\x18\x03 \x01(\x01:\x03\x30.9\x12\x1f\n\x10\x62\x65ta2_decay_rate\x18\x04 \x01(\x01:\x05\x30.999\x12\x1a\n\x0b\x61\x64\x61_epsilon\x18\x05 \x01(\x01:\x05\x31\x65-08\x12\x15\n\rweight_bounds\x18\x06 \x03(\x02\"\xe1\x01\n\x15\x44\x65nseSGDRuleParameter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12&\n\x04\x61\x64\x61m\x18\x02 \x01(\x0b\x32\x18.paddle.AdamSGDParameter\x12(\n\x05naive\x18\x03 \x01(\x0b\x32\x19.paddle.NaiveSGDParameter\x12,\n\x07summary\x18\x04 \x01(\x0b\x32\x1b.paddle.SummarySGDParameter\x12:\n\x0emoving_average\x18\x05 \x01(\x0b\x32\".paddle.MovingAverageRuleParameter\"\xac\x01\n\x10\x41\x64\x61mSGDParameter\x12\x1c\n\rlearning_rate\x18\x01 \x01(\x01:\x05\x35\x65-06\x12 \n\x0e\x61vg_decay_rate\x18\x02 \x01(\x01:\x08\x30.999993\x12\x1e\n\x0e\x61\x64\x61_decay_rate\x18\x03 \x01(\x01:\x06\x30.9999\x12\x1a\n\x0b\x61\x64\x61_epsilon\x18\x04 \x01(\x01:\x05\x31\x65-08\x12\x1c\n\x0emom_decay_rate\x18\x05 \x01(\x01:\x04\x30.99\"J\n\x11NaiveSGDParameter\x12\x1d\n\rlearning_rate\x18\x01 \x01(\x01:\x06\x30.0002\x12\x16\n\x0e\x61vg_decay_rate\x18\x02 \x01(\x01\";\n\x13SummarySGDParameter\x12$\n\x12summary_decay_rate\x18\x01 \x01(\x01:\x08\x30.999999\".\n\x1aMovingAverageRuleParameter\x12\x10\n\x08momentum\x18\x01 \x01(\x01\"I\n\x11PsResponseMessage\x12\x13\n\x08\x65rr_code\x18\x01 \x02(\x05:\x01\x30\x12\x11\n\x07\x65rr_msg\x18\x02 \x02(\t:\x00\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\xd5\x01\n\x11\x46sClientParameter\x12:\n\x07\x66s_type\x18\x01 \x01(\x0e\x32#.paddle.FsClientParameter.FsApiType:\x04HDFS\x12\x0b\n\x03uri\x18\x02 \x01(\t\x12\x0c\n\x04user\x18\x03 \x01(\t\x12\x0e\n\x06passwd\x18\x04 \x01(\t\x12\x13\n\x0b\x62uffer_size\x18\x05 \x01(\x05\x12\x12\n\nhadoop_bin\x18\x33 \x01(\t\x12\x10\n\x08\x61\x66s_conf\x18\x65 \x01(\t\"\x1e\n\tFsApiType\x12\x08\n\x04HDFS\x10\x00\x12\x07\n\x03\x41\x46S\x10\x01*4\n\tTableType\x12\x13\n\x0fPS_SPARSE_TABLE\x10\x00\x12\x12\n\x0ePS_DENSE_TABLE\x10\x01*\xba\x04\n\x07PsCmdID\x12\x17\n\x13PS_PULL_DENSE_TABLE\x10\x00\x12\x17\n\x13PS_PUSH_DENSE_TABLE\x10\x01\x12\x18\n\x14PS_PULL_SPARSE_TABLE\x10\x02\x12\x18\n\x14PS_PUSH_SPARSE_TABLE\x10\x03\x12\x13\n\x0fPS_SHRINK_TABLE\x10\x04\x12\x15\n\x11PS_SAVE_ONE_TABLE\x10\x05\x12\x15\n\x11PS_SAVE_ALL_TABLE\x10\x06\x12\x15\n\x11PS_LOAD_ONE_TABLE\x10\x07\x12\x15\n\x11PS_LOAD_ALL_TABLE\x10\x08\x12\x16\n\x12PS_CLEAR_ONE_TABLE\x10\t\x12\x16\n\x12PS_CLEAR_ALL_TABLE\x10\n\x12\x17\n\x13PS_PUSH_DENSE_PARAM\x10\x0b\x12\x12\n\x0ePS_STOP_SERVER\x10\x0c\x12\x1b\n\x17PS_SAVE_ONE_CACHE_TABLE\x10\r\x12\x1a\n\x16PS_GET_CACHE_THRESHOLD\x10\x0e\x12\x14\n\x10PS_CACHE_SHUFFLE\x10\x0f\x12\x11\n\rPS_COPY_TABLE\x10\x10\x12\x1c\n\x18PS_COPY_TABLE_BY_FEASIGN\x10\x11\x12(\n$PS_PULL_SPARSE_TABLE_WITH_DEPENDENCY\x10\x12\x12(\n$PS_PUSH_SPARSE_TABLE_WITH_DEPENDENCY\x10\x13\x12\x17\n\x13PS_PRINT_TABLE_STAT\x10\x14\x12\x0e\n\nPS_S2S_MSG\x10\x65\x32K\n\tPsService\x12>\n\x07service\x12\x18.paddle.PsRequestMessage\x1a\x19.paddle.PsResponseMessageB\x06\x80\x01\x01\xf8\x01\x01'
)) ))
_sym_db.RegisterFileDescriptor(DESCRIPTOR) _sym_db.RegisterFileDescriptor(DESCRIPTOR)
...@@ -49,8 +49,8 @@ _TABLETYPE = _descriptor.EnumDescriptor( ...@@ -49,8 +49,8 @@ _TABLETYPE = _descriptor.EnumDescriptor(
], ],
containing_type=None, containing_type=None,
options=None, options=None,
serialized_start=4493, serialized_start=4679,
serialized_end=4545, ) serialized_end=4731, )
_sym_db.RegisterEnumDescriptor(_TABLETYPE) _sym_db.RegisterEnumDescriptor(_TABLETYPE)
TableType = enum_type_wrapper.EnumTypeWrapper(_TABLETYPE) TableType = enum_type_wrapper.EnumTypeWrapper(_TABLETYPE)
...@@ -170,12 +170,18 @@ _PSCMDID = _descriptor.EnumDescriptor( ...@@ -170,12 +170,18 @@ _PSCMDID = _descriptor.EnumDescriptor(
options=None, options=None,
type=None), type=None),
_descriptor.EnumValueDescriptor( _descriptor.EnumValueDescriptor(
name='PS_S2S_MSG', index=20, number=101, options=None, type=None), name='PS_PRINT_TABLE_STAT',
index=20,
number=20,
options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='PS_S2S_MSG', index=21, number=101, options=None, type=None),
], ],
containing_type=None, containing_type=None,
options=None, options=None,
serialized_start=4548, serialized_start=4734,
serialized_end=5093, ) serialized_end=5304, )
_sym_db.RegisterEnumDescriptor(_PSCMDID) _sym_db.RegisterEnumDescriptor(_PSCMDID)
PsCmdID = enum_type_wrapper.EnumTypeWrapper(_PSCMDID) PsCmdID = enum_type_wrapper.EnumTypeWrapper(_PSCMDID)
...@@ -201,6 +207,7 @@ PS_COPY_TABLE = 16 ...@@ -201,6 +207,7 @@ PS_COPY_TABLE = 16
PS_COPY_TABLE_BY_FEASIGN = 17 PS_COPY_TABLE_BY_FEASIGN = 17
PS_PULL_SPARSE_TABLE_WITH_DEPENDENCY = 18 PS_PULL_SPARSE_TABLE_WITH_DEPENDENCY = 18
PS_PUSH_SPARSE_TABLE_WITH_DEPENDENCY = 19 PS_PUSH_SPARSE_TABLE_WITH_DEPENDENCY = 19
PS_PRINT_TABLE_STAT = 20
PS_S2S_MSG = 101 PS_S2S_MSG = 101
_FSCLIENTPARAMETER_FSAPITYPE = _descriptor.EnumDescriptor( _FSCLIENTPARAMETER_FSAPITYPE = _descriptor.EnumDescriptor(
...@@ -216,8 +223,8 @@ _FSCLIENTPARAMETER_FSAPITYPE = _descriptor.EnumDescriptor( ...@@ -216,8 +223,8 @@ _FSCLIENTPARAMETER_FSAPITYPE = _descriptor.EnumDescriptor(
], ],
containing_type=None, containing_type=None,
options=None, options=None,
serialized_start=4461, serialized_start=4647,
serialized_end=4491, ) serialized_end=4677, )
_sym_db.RegisterEnumDescriptor(_FSCLIENTPARAMETER_FSAPITYPE) _sym_db.RegisterEnumDescriptor(_FSCLIENTPARAMETER_FSAPITYPE)
_PSPARAMETER = _descriptor.Descriptor( _PSPARAMETER = _descriptor.Descriptor(
...@@ -275,10 +282,26 @@ _PSPARAMETER = _descriptor.Descriptor( ...@@ -275,10 +282,26 @@ _PSPARAMETER = _descriptor.Descriptor(
is_extension=False, is_extension=False,
extension_scope=None, extension_scope=None,
options=None), options=None),
_descriptor.FieldDescriptor(
name='init_gflags',
full_name='paddle.PSParameter.init_gflags',
index=3,
number=4,
type=9,
cpp_type=9,
label=1,
has_default_value=True,
default_value=_b("").decode('utf-8'),
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor( _descriptor.FieldDescriptor(
name='worker_param', name='worker_param',
full_name='paddle.PSParameter.worker_param', full_name='paddle.PSParameter.worker_param',
index=3, index=4,
number=101, number=101,
type=11, type=11,
cpp_type=10, cpp_type=10,
...@@ -294,7 +317,7 @@ _PSPARAMETER = _descriptor.Descriptor( ...@@ -294,7 +317,7 @@ _PSPARAMETER = _descriptor.Descriptor(
_descriptor.FieldDescriptor( _descriptor.FieldDescriptor(
name='server_param', name='server_param',
full_name='paddle.PSParameter.server_param', full_name='paddle.PSParameter.server_param',
index=4, index=5,
number=102, number=102,
type=11, type=11,
cpp_type=10, cpp_type=10,
...@@ -310,7 +333,7 @@ _PSPARAMETER = _descriptor.Descriptor( ...@@ -310,7 +333,7 @@ _PSPARAMETER = _descriptor.Descriptor(
_descriptor.FieldDescriptor( _descriptor.FieldDescriptor(
name='trainer_param', name='trainer_param',
full_name='paddle.PSParameter.trainer_param', full_name='paddle.PSParameter.trainer_param',
index=5, index=6,
number=301, number=301,
type=11, type=11,
cpp_type=10, cpp_type=10,
...@@ -326,7 +349,7 @@ _PSPARAMETER = _descriptor.Descriptor( ...@@ -326,7 +349,7 @@ _PSPARAMETER = _descriptor.Descriptor(
_descriptor.FieldDescriptor( _descriptor.FieldDescriptor(
name='fs_client_param', name='fs_client_param',
full_name='paddle.PSParameter.fs_client_param', full_name='paddle.PSParameter.fs_client_param',
index=6, index=7,
number=501, number=501,
type=11, type=11,
cpp_type=10, cpp_type=10,
...@@ -349,7 +372,7 @@ _PSPARAMETER = _descriptor.Descriptor( ...@@ -349,7 +372,7 @@ _PSPARAMETER = _descriptor.Descriptor(
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=21, serialized_start=21,
serialized_end=307, ) serialized_end=330, )
_WORKERPARAMETER = _descriptor.Descriptor( _WORKERPARAMETER = _descriptor.Descriptor(
name='WorkerParameter', name='WorkerParameter',
...@@ -383,8 +406,8 @@ _WORKERPARAMETER = _descriptor.Descriptor( ...@@ -383,8 +406,8 @@ _WORKERPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=309, serialized_start=332,
serialized_end=390, ) serialized_end=413, )
_SERVERPARAMETER = _descriptor.Descriptor( _SERVERPARAMETER = _descriptor.Descriptor(
name='ServerParameter', name='ServerParameter',
...@@ -418,8 +441,8 @@ _SERVERPARAMETER = _descriptor.Descriptor( ...@@ -418,8 +441,8 @@ _SERVERPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=392, serialized_start=415,
serialized_end=473, ) serialized_end=496, )
_DOWNPOURWORKERPARAMETER = _descriptor.Descriptor( _DOWNPOURWORKERPARAMETER = _descriptor.Descriptor(
name='DownpourWorkerParameter', name='DownpourWorkerParameter',
...@@ -453,8 +476,8 @@ _DOWNPOURWORKERPARAMETER = _descriptor.Descriptor( ...@@ -453,8 +476,8 @@ _DOWNPOURWORKERPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=475, serialized_start=498,
serialized_end=554, ) serialized_end=577, )
_DOWNPOURTRAINERPARAMETER = _descriptor.Descriptor( _DOWNPOURTRAINERPARAMETER = _descriptor.Descriptor(
name='DownpourTrainerParameter', name='DownpourTrainerParameter',
...@@ -568,8 +591,8 @@ _DOWNPOURTRAINERPARAMETER = _descriptor.Descriptor( ...@@ -568,8 +591,8 @@ _DOWNPOURTRAINERPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=557, serialized_start=580,
serialized_end=810, ) serialized_end=833, )
_PROGRAMCONFIG = _descriptor.Descriptor( _PROGRAMCONFIG = _descriptor.Descriptor(
name='ProgramConfig', name='ProgramConfig',
...@@ -667,8 +690,8 @@ _PROGRAMCONFIG = _descriptor.Descriptor( ...@@ -667,8 +690,8 @@ _PROGRAMCONFIG = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=813, serialized_start=836,
serialized_end=966, ) serialized_end=989, )
_DENSETABLEPARAMETER = _descriptor.Descriptor( _DENSETABLEPARAMETER = _descriptor.Descriptor(
name='DenseTableParameter', name='DenseTableParameter',
...@@ -750,8 +773,8 @@ _DENSETABLEPARAMETER = _descriptor.Descriptor( ...@@ -750,8 +773,8 @@ _DENSETABLEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=968, serialized_start=991,
serialized_end=1091, ) serialized_end=1114, )
_SPARSETABLEPARAMETER = _descriptor.Descriptor( _SPARSETABLEPARAMETER = _descriptor.Descriptor(
name='SparseTableParameter', name='SparseTableParameter',
...@@ -849,8 +872,8 @@ _SPARSETABLEPARAMETER = _descriptor.Descriptor( ...@@ -849,8 +872,8 @@ _SPARSETABLEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=1093, serialized_start=1116,
serialized_end=1215, ) serialized_end=1238, )
_DOWNPOURSERVERPARAMETER = _descriptor.Descriptor( _DOWNPOURSERVERPARAMETER = _descriptor.Descriptor(
name='DownpourServerParameter', name='DownpourServerParameter',
...@@ -900,8 +923,8 @@ _DOWNPOURSERVERPARAMETER = _descriptor.Descriptor( ...@@ -900,8 +923,8 @@ _DOWNPOURSERVERPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=1218, serialized_start=1241,
serialized_end=1352, ) serialized_end=1375, )
_SERVERSERVICEPARAMETER = _descriptor.Descriptor( _SERVERSERVICEPARAMETER = _descriptor.Descriptor(
name='ServerServiceParameter', name='ServerServiceParameter',
...@@ -999,8 +1022,8 @@ _SERVERSERVICEPARAMETER = _descriptor.Descriptor( ...@@ -999,8 +1022,8 @@ _SERVERSERVICEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=1355, serialized_start=1378,
serialized_end=1570, ) serialized_end=1593, )
_TABLEPARAMETER = _descriptor.Descriptor( _TABLEPARAMETER = _descriptor.Descriptor(
name='TableParameter', name='TableParameter',
...@@ -1162,8 +1185,8 @@ _TABLEPARAMETER = _descriptor.Descriptor( ...@@ -1162,8 +1185,8 @@ _TABLEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=1573, serialized_start=1596,
serialized_end=1893, ) serialized_end=1916, )
_TABLEACCESSORPARAMETER = _descriptor.Descriptor( _TABLEACCESSORPARAMETER = _descriptor.Descriptor(
name='TableAccessorParameter', name='TableAccessorParameter',
...@@ -1316,6 +1339,38 @@ _TABLEACCESSORPARAMETER = _descriptor.Descriptor( ...@@ -1316,6 +1339,38 @@ _TABLEACCESSORPARAMETER = _descriptor.Descriptor(
is_extension=False, is_extension=False,
extension_scope=None, extension_scope=None,
options=None), options=None),
_descriptor.FieldDescriptor(
name='embed_sgd_param',
full_name='paddle.TableAccessorParameter.embed_sgd_param',
index=9,
number=10,
type=11,
cpp_type=10,
label=1,
has_default_value=False,
default_value=None,
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
name='embedx_sgd_param',
full_name='paddle.TableAccessorParameter.embedx_sgd_param',
index=10,
number=11,
type=11,
cpp_type=10,
label=1,
has_default_value=False,
default_value=None,
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
], ],
extensions=[], extensions=[],
nested_types=[], nested_types=[],
...@@ -1325,8 +1380,8 @@ _TABLEACCESSORPARAMETER = _descriptor.Descriptor( ...@@ -1325,8 +1380,8 @@ _TABLEACCESSORPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=1896, serialized_start=1919,
serialized_end=2346, ) serialized_end=2496, )
_DOWNPOURTABLEACCESSORPARAMETER = _descriptor.Descriptor( _DOWNPOURTABLEACCESSORPARAMETER = _descriptor.Descriptor(
name='DownpourTableAccessorParameter', name='DownpourTableAccessorParameter',
...@@ -1463,6 +1518,22 @@ _DOWNPOURTABLEACCESSORPARAMETER = _descriptor.Descriptor( ...@@ -1463,6 +1518,22 @@ _DOWNPOURTABLEACCESSORPARAMETER = _descriptor.Descriptor(
is_extension=False, is_extension=False,
extension_scope=None, extension_scope=None,
options=None), options=None),
_descriptor.FieldDescriptor(
name='ssd_unseenday_threshold',
full_name='paddle.DownpourTableAccessorParameter.ssd_unseenday_threshold',
index=8,
number=9,
type=5,
cpp_type=1,
label=1,
has_default_value=True,
default_value=1,
message_type=None,
enum_type=None,
containing_type=None,
is_extension=False,
extension_scope=None,
options=None),
], ],
extensions=[], extensions=[],
nested_types=[], nested_types=[],
...@@ -1472,8 +1543,8 @@ _DOWNPOURTABLEACCESSORPARAMETER = _descriptor.Descriptor( ...@@ -1472,8 +1543,8 @@ _DOWNPOURTABLEACCESSORPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=2349, serialized_start=2499,
serialized_end=2627, ) serialized_end=2813, )
_TABLEACCESSORSAVEPARAMETER = _descriptor.Descriptor( _TABLEACCESSORSAVEPARAMETER = _descriptor.Descriptor(
name='TableAccessorSaveParameter', name='TableAccessorSaveParameter',
...@@ -1539,8 +1610,8 @@ _TABLEACCESSORSAVEPARAMETER = _descriptor.Descriptor( ...@@ -1539,8 +1610,8 @@ _TABLEACCESSORSAVEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=2629, serialized_start=2815,
serialized_end=2712, ) serialized_end=2898, )
_PSREQUESTMESSAGE = _descriptor.Descriptor( _PSREQUESTMESSAGE = _descriptor.Descriptor(
name='PsRequestMessage', name='PsRequestMessage',
...@@ -1638,8 +1709,8 @@ _PSREQUESTMESSAGE = _descriptor.Descriptor( ...@@ -1638,8 +1709,8 @@ _PSREQUESTMESSAGE = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=2714, serialized_start=2900,
serialized_end=2815, ) serialized_end=3001, )
_SPARSESGDRULEPARAMETER = _descriptor.Descriptor( _SPARSESGDRULEPARAMETER = _descriptor.Descriptor(
name='SparseSGDRuleParameter', name='SparseSGDRuleParameter',
...@@ -1721,8 +1792,8 @@ _SPARSESGDRULEPARAMETER = _descriptor.Descriptor( ...@@ -1721,8 +1792,8 @@ _SPARSESGDRULEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=2818, serialized_start=3004,
serialized_end=2951, ) serialized_end=3137, )
_SPARSECOMMONSGDRULEPARAMETER = _descriptor.Descriptor( _SPARSECOMMONSGDRULEPARAMETER = _descriptor.Descriptor(
name='SparseCommonSGDRuleParameter', name='SparseCommonSGDRuleParameter',
...@@ -1804,8 +1875,8 @@ _SPARSECOMMONSGDRULEPARAMETER = _descriptor.Descriptor( ...@@ -1804,8 +1875,8 @@ _SPARSECOMMONSGDRULEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=2954, serialized_start=3140,
serialized_end=3152, ) serialized_end=3338, )
_SPARSENAIVESGDRULEPARAMETER = _descriptor.Descriptor( _SPARSENAIVESGDRULEPARAMETER = _descriptor.Descriptor(
name='SparseNaiveSGDRuleParameter', name='SparseNaiveSGDRuleParameter',
...@@ -1871,8 +1942,8 @@ _SPARSENAIVESGDRULEPARAMETER = _descriptor.Descriptor( ...@@ -1871,8 +1942,8 @@ _SPARSENAIVESGDRULEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=3154, serialized_start=3340,
serialized_end=3266, ) serialized_end=3452, )
_SPARSEADAGRADSGDRULEPARAMETER = _descriptor.Descriptor( _SPARSEADAGRADSGDRULEPARAMETER = _descriptor.Descriptor(
name='SparseAdagradSGDRuleParameter', name='SparseAdagradSGDRuleParameter',
...@@ -1954,8 +2025,8 @@ _SPARSEADAGRADSGDRULEPARAMETER = _descriptor.Descriptor( ...@@ -1954,8 +2025,8 @@ _SPARSEADAGRADSGDRULEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=3269, serialized_start=3455,
serialized_end=3409, ) serialized_end=3595, )
_SPARSEADAMSGDPARAMETER = _descriptor.Descriptor( _SPARSEADAMSGDPARAMETER = _descriptor.Descriptor(
name='SparseAdamSGDParameter', name='SparseAdamSGDParameter',
...@@ -2069,8 +2140,8 @@ _SPARSEADAMSGDPARAMETER = _descriptor.Descriptor( ...@@ -2069,8 +2140,8 @@ _SPARSEADAMSGDPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=3412, serialized_start=3598,
serialized_end=3612, ) serialized_end=3798, )
_DENSESGDRULEPARAMETER = _descriptor.Descriptor( _DENSESGDRULEPARAMETER = _descriptor.Descriptor(
name='DenseSGDRuleParameter', name='DenseSGDRuleParameter',
...@@ -2168,8 +2239,8 @@ _DENSESGDRULEPARAMETER = _descriptor.Descriptor( ...@@ -2168,8 +2239,8 @@ _DENSESGDRULEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=3615, serialized_start=3801,
serialized_end=3840, ) serialized_end=4026, )
_ADAMSGDPARAMETER = _descriptor.Descriptor( _ADAMSGDPARAMETER = _descriptor.Descriptor(
name='AdamSGDParameter', name='AdamSGDParameter',
...@@ -2267,8 +2338,8 @@ _ADAMSGDPARAMETER = _descriptor.Descriptor( ...@@ -2267,8 +2338,8 @@ _ADAMSGDPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=3843, serialized_start=4029,
serialized_end=4015, ) serialized_end=4201, )
_NAIVESGDPARAMETER = _descriptor.Descriptor( _NAIVESGDPARAMETER = _descriptor.Descriptor(
name='NaiveSGDParameter', name='NaiveSGDParameter',
...@@ -2318,8 +2389,8 @@ _NAIVESGDPARAMETER = _descriptor.Descriptor( ...@@ -2318,8 +2389,8 @@ _NAIVESGDPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=4017, serialized_start=4203,
serialized_end=4091, ) serialized_end=4277, )
_SUMMARYSGDPARAMETER = _descriptor.Descriptor( _SUMMARYSGDPARAMETER = _descriptor.Descriptor(
name='SummarySGDParameter', name='SummarySGDParameter',
...@@ -2353,8 +2424,8 @@ _SUMMARYSGDPARAMETER = _descriptor.Descriptor( ...@@ -2353,8 +2424,8 @@ _SUMMARYSGDPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=4093, serialized_start=4279,
serialized_end=4152, ) serialized_end=4338, )
_MOVINGAVERAGERULEPARAMETER = _descriptor.Descriptor( _MOVINGAVERAGERULEPARAMETER = _descriptor.Descriptor(
name='MovingAverageRuleParameter', name='MovingAverageRuleParameter',
...@@ -2388,8 +2459,8 @@ _MOVINGAVERAGERULEPARAMETER = _descriptor.Descriptor( ...@@ -2388,8 +2459,8 @@ _MOVINGAVERAGERULEPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=4154, serialized_start=4340,
serialized_end=4200, ) serialized_end=4386, )
_PSRESPONSEMESSAGE = _descriptor.Descriptor( _PSRESPONSEMESSAGE = _descriptor.Descriptor(
name='PsResponseMessage', name='PsResponseMessage',
...@@ -2455,8 +2526,8 @@ _PSRESPONSEMESSAGE = _descriptor.Descriptor( ...@@ -2455,8 +2526,8 @@ _PSRESPONSEMESSAGE = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=4202, serialized_start=4388,
serialized_end=4275, ) serialized_end=4461, )
_FSCLIENTPARAMETER = _descriptor.Descriptor( _FSCLIENTPARAMETER = _descriptor.Descriptor(
name='FsClientParameter', name='FsClientParameter',
...@@ -2586,8 +2657,8 @@ _FSCLIENTPARAMETER = _descriptor.Descriptor( ...@@ -2586,8 +2657,8 @@ _FSCLIENTPARAMETER = _descriptor.Descriptor(
syntax='proto2', syntax='proto2',
extension_ranges=[], extension_ranges=[],
oneofs=[], oneofs=[],
serialized_start=4278, serialized_start=4464,
serialized_end=4491, ) serialized_end=4677, )
_PSPARAMETER.fields_by_name['worker_param'].message_type = _WORKERPARAMETER _PSPARAMETER.fields_by_name['worker_param'].message_type = _WORKERPARAMETER
_PSPARAMETER.fields_by_name['server_param'].message_type = _SERVERPARAMETER _PSPARAMETER.fields_by_name['server_param'].message_type = _SERVERPARAMETER
...@@ -2623,6 +2694,10 @@ _TABLEACCESSORPARAMETER.fields_by_name[ ...@@ -2623,6 +2694,10 @@ _TABLEACCESSORPARAMETER.fields_by_name[
'table_accessor_save_param'].message_type = _TABLEACCESSORSAVEPARAMETER 'table_accessor_save_param'].message_type = _TABLEACCESSORSAVEPARAMETER
_TABLEACCESSORPARAMETER.fields_by_name[ _TABLEACCESSORPARAMETER.fields_by_name[
'sparse_commonsgd_param'].message_type = _SPARSECOMMONSGDRULEPARAMETER 'sparse_commonsgd_param'].message_type = _SPARSECOMMONSGDRULEPARAMETER
_TABLEACCESSORPARAMETER.fields_by_name[
'embed_sgd_param'].message_type = _SPARSECOMMONSGDRULEPARAMETER
_TABLEACCESSORPARAMETER.fields_by_name[
'embedx_sgd_param'].message_type = _SPARSECOMMONSGDRULEPARAMETER
_SPARSECOMMONSGDRULEPARAMETER.fields_by_name[ _SPARSECOMMONSGDRULEPARAMETER.fields_by_name[
'naive'].message_type = _SPARSENAIVESGDRULEPARAMETER 'naive'].message_type = _SPARSENAIVESGDRULEPARAMETER
_SPARSECOMMONSGDRULEPARAMETER.fields_by_name[ _SPARSECOMMONSGDRULEPARAMETER.fields_by_name[
...@@ -2954,5 +3029,5 @@ _sym_db.RegisterMessage(FsClientParameter) ...@@ -2954,5 +3029,5 @@ _sym_db.RegisterMessage(FsClientParameter)
DESCRIPTOR.has_options = True DESCRIPTOR.has_options = True
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(),
_b('\200\001\001')) _b('\200\001\001\370\001\001'))
# @@protoc_insertion_point(module_scope) # @@protoc_insertion_point(module_scope)
...@@ -26,7 +26,7 @@ import sys ...@@ -26,7 +26,7 @@ import sys
from op_test import OpTest from op_test import OpTest
from paddle.fluid.trainer_desc import DistMultiTrainer from paddle.fluid.trainer_desc import DistMultiTrainer
from paddle.fluid.device_worker import DownpourSGD, DownpourSGDOPT from paddle.fluid.device_worker import DownpourSGD, DownpourSGDOPT
from paddle.fluid.incubate.fleet.parameter_server.pslib.node import DownpourWorker from paddle.fluid.incubate.fleet.parameter_server.pslib.node import DownpourWorker, DownpourServer
from google.protobuf import text_format from google.protobuf import text_format
import paddle.fluid.incubate.fleet.parameter_server.pslib.ps_pb2 as pslib import paddle.fluid.incubate.fleet.parameter_server.pslib.ps_pb2 as pslib
from paddle.fluid.trainer_factory import TrainerFactory from paddle.fluid.trainer_factory import TrainerFactory
...@@ -91,6 +91,8 @@ class TestListenAndServOp(unittest.TestCase): ...@@ -91,6 +91,8 @@ class TestListenAndServOp(unittest.TestCase):
opt_info["dump_slot"] = False opt_info["dump_slot"] = False
opt_info["stat_var_names"] = [] opt_info["stat_var_names"] = []
worker = DownpourWorker(None) worker = DownpourWorker(None)
server = DownpourServer()
server.add_sparse_table(0, {})
worker.get_desc().CopyFrom(ps_param.trainer_param[0]) worker.get_desc().CopyFrom(ps_param.trainer_param[0])
opt_info["program_id_to_worker"] = {program_id: worker} opt_info["program_id_to_worker"] = {program_id: worker}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册