diff --git a/paddle_hub/module_desc.proto b/paddle_hub/module_desc.proto index 516408a0332030dc9068f324b829cef63ab9bc35..c4eac5731af60d30f4e2629ab10257bea5d0e784 100755 --- a/paddle_hub/module_desc.proto +++ b/paddle_hub/module_desc.proto @@ -36,12 +36,6 @@ message ModuleVar { repeated FeedDesc feed_desc = 2; } -message Parameter { - string name = 1; - double learning_rate = 2; - bool trainable = 3; -}; - // A Hub Module is stored in a directory with a file 'paddlehub.pb' // containing a serialized protocol message of this type. The further contents // of the directory depend on the storage format described by the message. @@ -51,11 +45,9 @@ message ModuleDesc { // signature to module variable map sign2var = 2; - - repeated Parameter parameters = 3; - bool return_numpy = 4; + bool return_numpy = 3; - bool contain_assets = 5; + bool contain_assets = 4; }; diff --git a/paddle_hub/module_desc_pb2.py b/paddle_hub/module_desc_pb2.py index 24d483d0a6e280d6a27e2d2f463b19b9a120cf07..70db400dea93ae9272f625bb389ab0753a098ae9 100644 --- a/paddle_hub/module_desc_pb2.py +++ b/paddle_hub/module_desc_pb2.py @@ -17,7 +17,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='paddle_hub', syntax='proto3', serialized_pb=_b( - '\n\x11module_desc.proto\x12\npaddle_hub\")\n\x08\x46\x65\x65\x64\x44\x65sc\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08var_name\x18\x02 \x01(\t\"*\n\tFetchDesc\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08var_name\x18\x02 \x01(\t\"_\n\tModuleVar\x12)\n\nfetch_desc\x18\x01 \x03(\x0b\x32\x15.paddle_hub.FetchDesc\x12\'\n\tfeed_desc\x18\x02 \x03(\x0b\x32\x14.paddle_hub.FeedDesc\"C\n\tParameter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x15\n\rlearning_rate\x18\x02 \x01(\x01\x12\x11\n\ttrainable\x18\x03 \x01(\x08\"\xf3\x01\n\nModuleDesc\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x36\n\x08sign2var\x18\x02 \x03(\x0b\x32$.paddle_hub.ModuleDesc.Sign2varEntry\x12)\n\nparameters\x18\x03 \x03(\x0b\x32\x15.paddle_hub.Parameter\x12\x14\n\x0creturn_numpy\x18\x04 \x01(\x08\x12\x16\n\x0e\x63ontain_assets\x18\x05 \x01(\x08\x1a\x46\n\rSign2varEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.paddle_hub.ModuleVar:\x02\x38\x01\x42\x02H\x03\x62\x06proto3' + '\n\x11module_desc.proto\x12\npaddle_hub\")\n\x08\x46\x65\x65\x64\x44\x65sc\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08var_name\x18\x02 \x01(\t\"*\n\tFetchDesc\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x10\n\x08var_name\x18\x02 \x01(\t\"_\n\tModuleVar\x12)\n\nfetch_desc\x18\x01 \x03(\x0b\x32\x15.paddle_hub.FetchDesc\x12\'\n\tfeed_desc\x18\x02 \x03(\x0b\x32\x14.paddle_hub.FeedDesc\"\xc8\x01\n\nModuleDesc\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x36\n\x08sign2var\x18\x02 \x03(\x0b\x32$.paddle_hub.ModuleDesc.Sign2varEntry\x12\x14\n\x0creturn_numpy\x18\x03 \x01(\x08\x12\x16\n\x0e\x63ontain_assets\x18\x04 \x01(\x08\x1a\x46\n\rSign2varEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.paddle_hub.ModuleVar:\x02\x38\x01\x42\x02H\x03\x62\x06proto3' )) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -177,74 +177,6 @@ _MODULEVAR = _descriptor.Descriptor( serialized_end=215, ) -_PARAMETER = _descriptor.Descriptor( - name='Parameter', - full_name='paddle_hub.Parameter', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='name', - full_name='paddle_hub.Parameter.name', - index=0, - number=1, - type=9, - cpp_type=9, - label=1, - has_default_value=False, - 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( - name='learning_rate', - full_name='paddle_hub.Parameter.learning_rate', - index=1, - number=2, - type=1, - cpp_type=5, - label=1, - has_default_value=False, - default_value=float(0), - message_type=None, - enum_type=None, - containing_type=None, - is_extension=False, - extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='trainable', - full_name='paddle_hub.Parameter.trainable', - index=2, - number=3, - type=8, - cpp_type=7, - label=1, - has_default_value=False, - default_value=False, - message_type=None, - enum_type=None, - containing_type=None, - is_extension=False, - extension_scope=None, - options=None), - ], - extensions=[], - nested_types=[], - enum_types=[], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[], - serialized_start=217, - serialized_end=284, -) - _MODULEDESC_SIGN2VARENTRY = _descriptor.Descriptor( name='Sign2varEntry', full_name='paddle_hub.ModuleDesc.Sign2varEntry', @@ -294,8 +226,8 @@ _MODULEDESC_SIGN2VARENTRY = _descriptor.Descriptor( syntax='proto3', extension_ranges=[], oneofs=[], - serialized_start=460, - serialized_end=530, + serialized_start=348, + serialized_end=418, ) _MODULEDESC = _descriptor.Descriptor( @@ -337,27 +269,11 @@ _MODULEDESC = _descriptor.Descriptor( is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( - name='parameters', - full_name='paddle_hub.ModuleDesc.parameters', - index=2, - number=3, - type=11, - cpp_type=10, - label=3, - has_default_value=False, - default_value=[], - message_type=None, - enum_type=None, - containing_type=None, - is_extension=False, - extension_scope=None, - options=None), _descriptor.FieldDescriptor( name='return_numpy', full_name='paddle_hub.ModuleDesc.return_numpy', - index=3, - number=4, + index=2, + number=3, type=8, cpp_type=7, label=1, @@ -372,8 +288,8 @@ _MODULEDESC = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='contain_assets', full_name='paddle_hub.ModuleDesc.contain_assets', - index=4, - number=5, + index=3, + number=4, type=8, cpp_type=7, label=1, @@ -396,8 +312,8 @@ _MODULEDESC = _descriptor.Descriptor( syntax='proto3', extension_ranges=[], oneofs=[], - serialized_start=287, - serialized_end=530, + serialized_start=218, + serialized_end=418, ) _MODULEVAR.fields_by_name['fetch_desc'].message_type = _FETCHDESC @@ -405,11 +321,9 @@ _MODULEVAR.fields_by_name['feed_desc'].message_type = _FEEDDESC _MODULEDESC_SIGN2VARENTRY.fields_by_name['value'].message_type = _MODULEVAR _MODULEDESC_SIGN2VARENTRY.containing_type = _MODULEDESC _MODULEDESC.fields_by_name['sign2var'].message_type = _MODULEDESC_SIGN2VARENTRY -_MODULEDESC.fields_by_name['parameters'].message_type = _PARAMETER DESCRIPTOR.message_types_by_name['FeedDesc'] = _FEEDDESC DESCRIPTOR.message_types_by_name['FetchDesc'] = _FETCHDESC DESCRIPTOR.message_types_by_name['ModuleVar'] = _MODULEVAR -DESCRIPTOR.message_types_by_name['Parameter'] = _PARAMETER DESCRIPTOR.message_types_by_name['ModuleDesc'] = _MODULEDESC FeedDesc = _reflection.GeneratedProtocolMessageType( @@ -442,16 +356,6 @@ ModuleVar = _reflection.GeneratedProtocolMessageType( )) _sym_db.RegisterMessage(ModuleVar) -Parameter = _reflection.GeneratedProtocolMessageType( - 'Parameter', - (_message.Message, ), - dict( - DESCRIPTOR=_PARAMETER, - __module__='module_desc_pb2' - # @@protoc_insertion_point(class_scope:paddle_hub.Parameter) - )) -_sym_db.RegisterMessage(Parameter) - ModuleDesc = _reflection.GeneratedProtocolMessageType( 'ModuleDesc', (_message.Message, ),