Merge branch 'master' of https://github.com/PaddlePaddle/PaddleHub

Senta/nets.py

@@ -4,6 +4,7 @@ import numpy as np
 
 import paddle.fluid as fluid
 import paddle
+import paddle_hub as hub
 
 
 def bow_net(data,

Senta/sentiment_classify.py

@@ -189,7 +189,6 @@ def retrain_net(train_reader,
     hid_dim2 = 96
     class_dim = 2
 
-    # module_link = "https://paddlehub.cdn.bcebos.com/senta/bow_module_3.tar.gz"
     module_link = "./models/bow_net/"
     module = hub.Module(module_link)
 

paddle_hub/module.py

@@ -49,11 +49,13 @@ class Module(object):
             # if it's remote url link, then download and uncompress it
             self.module_name, self.module_dir = download_and_uncompress(
                 module_url)
+            #TODO(ZeyuChen): check url link is valid url
         elif module_dir is not None:
             # otherwise it's local path, no need to deal with it
             self.module_dir = module_dir
             # use the path name as module name by default
             self.module_name = module_dir.split("/")[-1]
+            #TODO(ZeyuChen) add more check about loading module from local path
 
         # load paddle inference model
         place = fluid.CPUPlace()

paddle_hub/module_desc_pb2.py

+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: module_desc.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='module_desc.proto',
+  package='paddle_hub',
+  syntax='proto3',
+  serialized_options=_b('H\003'),
+  serialized_pb=_b('\n\x11module_desc.proto\x12\npaddle_hub\"\x19\n\tInputDesc\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1a\n\nOutputDesc\x12\x0c\n\x04name\x18\x01 \x01(\t\"\xb3\x01\n\nModuleDesc\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\ninput_desc\x18\x02 \x03(\x0b\x32\x15.paddle_hub.InputDesc\x12+\n\x0boutput_desc\x18\x03 \x03(\x0b\x32\x16.paddle_hub.OutputDesc\x12\x11\n\tsignature\x18\x04 \x01(\t\x12\x14\n\x0creturn_numpy\x18\x05 \x01(\x08\x12\x16\n\x0e\x63ontain_assets\x18\x06 \x01(\x08\x42\x02H\x03\x62\x06proto3')
+)
+
+
+
+
+_INPUTDESC = _descriptor.Descriptor(
+  name='InputDesc',
+  full_name='paddle_hub.InputDesc',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='name', full_name='paddle_hub.InputDesc.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,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=33,
+  serialized_end=58,
+)
+
+
+_OUTPUTDESC = _descriptor.Descriptor(
+  name='OutputDesc',
+  full_name='paddle_hub.OutputDesc',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='name', full_name='paddle_hub.OutputDesc.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,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=60,
+  serialized_end=86,
+)
+
+
+_MODULEDESC = _descriptor.Descriptor(
+  name='ModuleDesc',
+  full_name='paddle_hub.ModuleDesc',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='name', full_name='paddle_hub.ModuleDesc.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,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='input_desc', full_name='paddle_hub.ModuleDesc.input_desc', index=1,
+      number=2, 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,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='output_desc', full_name='paddle_hub.ModuleDesc.output_desc', 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,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='signature', full_name='paddle_hub.ModuleDesc.signature', index=3,
+      number=4, 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,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='return_numpy', full_name='paddle_hub.ModuleDesc.return_numpy', index=4,
+      number=5, 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,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='contain_assets', full_name='paddle_hub.ModuleDesc.contain_assets', index=5,
+      number=6, 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,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=89,
+  serialized_end=268,
+)
+
+_MODULEDESC.fields_by_name['input_desc'].message_type = _INPUTDESC
+_MODULEDESC.fields_by_name['output_desc'].message_type = _OUTPUTDESC
+DESCRIPTOR.message_types_by_name['InputDesc'] = _INPUTDESC
+DESCRIPTOR.message_types_by_name['OutputDesc'] = _OUTPUTDESC
+DESCRIPTOR.message_types_by_name['ModuleDesc'] = _MODULEDESC
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+InputDesc = _reflection.GeneratedProtocolMessageType('InputDesc', (_message.Message,), dict(
+  DESCRIPTOR = _INPUTDESC,
+  __module__ = 'module_desc_pb2'
+  # @@protoc_insertion_point(class_scope:paddle_hub.InputDesc)
+  ))
+_sym_db.RegisterMessage(InputDesc)
+
+OutputDesc = _reflection.GeneratedProtocolMessageType('OutputDesc', (_message.Message,), dict(
+  DESCRIPTOR = _OUTPUTDESC,
+  __module__ = 'module_desc_pb2'
+  # @@protoc_insertion_point(class_scope:paddle_hub.OutputDesc)
+  ))
+_sym_db.RegisterMessage(OutputDesc)
+
+ModuleDesc = _reflection.GeneratedProtocolMessageType('ModuleDesc', (_message.Message,), dict(
+  DESCRIPTOR = _MODULEDESC,
+  __module__ = 'module_desc_pb2'
+  # @@protoc_insertion_point(class_scope:paddle_hub.ModuleDesc)
+  ))
+_sym_db.RegisterMessage(ModuleDesc)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)

tests/test_export_n_load_module.py

@@ -58,7 +58,6 @@ def module_fn(trainable=False):
         name="words", shape=[1], lod_level=1, dtype="int64")
 
     # create embedding
-    # emb_name = "{}:embedding".format(module_scope)
     emb_name = "embedding"
     emb_param_attr = fluid.ParamAttr(name=emb_name, trainable=trainable)
     word_emb = fluid.layers.embedding(