rename paddle_hub to paddlehub

README.md

@@ -16,7 +16,7 @@ PaddleHub旨在为PaddlePaddle提供一个简明易用的预训练模型管理
 # 安装
 paddle hub直接通过pip进行安装（python3以上），使用如下命令来安装paddle hub
 ```
-pip install paddle_hub
+pip install paddlehub
 ```
 # 快速体验
 通过下面的命令，来体验下paddle hub的魅力

demo/ernie-classification/finetune_with_hub.py

@@ -24,7 +24,7 @@ import numpy as np
 
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
+import paddlehub as hub
 
 # yapf: disable
 parser = argparse.ArgumentParser(__doc__)

demo/image-classification/create_module.py

 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
+
 import os
 import functools
 import argparse
+
 import paddle
 import paddle.fluid as fluid
+
 import nets
-import paddle_hub as hub
+import paddlehub as hub
 import processor
 from utility import add_arguments, print_arguments
 parser = argparse.ArgumentParser(description=__doc__)

demo/image-classification/infer.sh

-python ../../paddle_hub/commands/hub.py run hub_module_ResNet50/ --signature classification --config resources/test/test.yml  --dataset resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_ResNet50/ --signature classification --config resources/test/test.yml  --dataset resources/test/test.csv

demo/image-classification/processor.py

+import os
+
 import paddle
-import paddle_hub as hub
 import numpy as np
-import os
-from paddle_hub import BaseProcessor
 from PIL import Image
 
+from paddlehub import BaseProcessor
+import paddlehub as hub
+
 DATA_DIM = 224
 img_mean = np.array([0.485, 0.456, 0.406]).reshape((3, 1, 1))
 img_std = np.array([0.229, 0.224, 0.225]).reshape((3, 1, 1))

demo/image-classification/retrain.py

-import paddle_hub as hub
 import paddle
 import paddle.fluid as fluid
 
+import paddlehub as hub
+
 
 def train():
-    resnet_module = hub.Module(name="resnet50_imagenet")
+    resnet_module = hub.Module(module_dir="hub_module_ResNet50")
     input_dict, output_dict, program = resnet_module.context(
         sign_name="feature_map", trainable=True)
     dataset = hub.dataset.Flowers()

demo/lac/create_module.py

@@ -2,7 +2,7 @@ import numpy as np
 import paddle
 import paddle.fluid as fluid
 import reader
-import paddle_hub as hub
+import paddlehub as hub
 import processor
 import os
 from network import lex_net

demo/lac/infer.sh

-python ../../paddle_hub/commands/hub.py run hub_module_lac/ --signature lexical_analysis --config resources/test/test.yml  --input_file resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_lac/ --signature lexical_analysis --config resources/test/test.yml  --input_file resources/test/test.csv

demo/lac/infer_by_code.py

 import os
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def infer_with_input_text():

demo/lac/processor.py

 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
+import paddlehub as hub
 import numpy as np
 import os
 import io
-from paddle_hub import BaseProcessor
+from paddlehub import BaseProcessor
 
 
 class Processor(BaseProcessor):

demo/senta/create_module.py

@@ -3,7 +3,7 @@ import paddle.fluid as fluid
 import processor
 import numpy as np
 import nets
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def load_vocab(file_path):

demo/senta/infer.sh

-python ../../paddle_hub/commands/hub.py run hub_module_senta/ --signature sentiment_classify --config resources/test/test.yml  --dataset resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_senta/ --signature sentiment_classify --config resources/test/test.yml  --dataset resources/test/test.csv

demo/senta/infer_by_code.py

 import os
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def infer_with_input_text():

demo/senta/processor.py

@@ -5,7 +5,7 @@ import paddle
 import paddle.fluid as fluid
 import numpy as np
 
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def load_vocab(file_path):

demo/ssd/create_module.py

 import os
 import numpy as np
 import processor
-import paddle_hub as hub
+import paddlehub as hub
 import paddle
 import paddle.fluid as fluid
 from mobilenet_ssd import mobile_net

demo/ssd/infer.sh

-python ../../paddle_hub/commands/hub.py run hub_module_ssd/ --signature object_detection --config resources/test/test.yml  --dataset resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_ssd/ --signature object_detection --config resources/test/test.yml  --dataset resources/test/test.csv

demo/ssd/infer_by_code.py

 import os
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def infer_with_input_text():

demo/ssd/processor.py

 import paddle
-import paddle_hub as hub
+import paddlehub as hub
 import numpy as np
 import os
-from paddle_hub import BaseProcessor
+from paddlehub import BaseProcessor
 from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont

docs/transfer_learning_turtorial.md

@@ -20,7 +20,7 @@ http://ftp.cs.wisc.edu/machine-learning/shavlik-group/torrey.handbook09.pdf
 ## CV教程
 以猫狗分类为例子，我们可以快速的使用一个通过ImageNet训练过的ResNet进行finetune
 ```python
-import paddle_hub as hub
+import paddlehub as hub
 import paddle
 import paddle.fluid as fluid
 

paddle_hub/commands/base_command.py → paddlehub/commands/base_command.py

@@ -15,9 +15,11 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.arg_helper import add_argument, print_arguments
+
 import argparse
 
+from paddlehub.common.arg_helper import add_argument, print_arguments
+
 ENTRY = "hub"
 
 

paddle_hub/commands/download.py → paddlehub/commands/download.py

@@ -15,13 +15,15 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.hub_server import default_hub_server
+
 import argparse
 
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.hub_server import default_hub_server
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+
 
 class DownloadCommand(BaseCommand):
     name = "download"

paddle_hub/commands/help.py → paddlehub/commands/help.py

@@ -15,7 +15,8 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.commands.base_command import BaseCommand
+
+from paddlehub.commands.base_command import BaseCommand
 
 
 class HelpCommand(BaseCommand):

paddle_hub/commands/hub.py → paddlehub/commands/hub.py

@@ -15,15 +15,17 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub.commands import show
-from paddle_hub.commands import help
-from paddle_hub.commands import version
-from paddle_hub.commands import run
-from paddle_hub.commands import download
+
 import sys
 
+from paddlehub.common.logger import logger
+from paddlehub.commands.base_command import BaseCommand
+from paddlehub.commands import show
+from paddlehub.commands import help
+from paddlehub.commands import version
+from paddlehub.commands import run
+from paddlehub.commands import download
+
 
 class HubCommand(BaseCommand):
     name = "hub"

paddle_hub/commands/install.py → paddlehub/commands/install.py

@@ -17,10 +17,10 @@ from __future__ import print_function
 
 import argparse
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.module.manager import default_module_manager
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.module.manager import default_module_manager
+from paddlehub.commands.base_command import BaseCommand, ENTRY
 
 
 class InstallCommand(BaseCommand):

paddle_hub/commands/list.py → paddlehub/commands/list.py

@@ -16,11 +16,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.module.manager import default_module_manager
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.module.manager import default_module_manager
+from paddlehub.commands.base_command import BaseCommand
 
 
 class ListCommand(BaseCommand):

paddle_hub/commands/run.py → paddlehub/commands/run.py

@@ -16,17 +16,17 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.io.reader import csv_reader, yaml_reader
-from paddle_hub.module.manager import default_module_manager
-from paddle_hub.common import utils
-from paddle_hub.common.arg_helper import add_argument, print_arguments
-
-import paddle_hub as hub
 import argparse
 import os
 
+from paddlehub.common.logger import logger
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+from paddlehub.io.reader import csv_reader, yaml_reader
+from paddlehub.module.manager import default_module_manager
+from paddlehub.common import utils
+from paddlehub.common.arg_helper import add_argument, print_arguments
+import paddlehub as hub
+
 
 class RunCommand(BaseCommand):
     name = "run"

paddle_hub/commands/search.py → paddlehub/commands/search.py

@@ -15,12 +15,14 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.common.hub_server import default_hub_server
+
 import argparse
 
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.common.hub_server import default_hub_server
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+
 
 class SearchCommand(BaseCommand):
     name = "search"
@@ -44,7 +46,8 @@ class SearchCommand(BaseCommand):
         module_name = argv[0]
         module_list = default_hub_server.search_module(module_name)
         text = "\n"
-        text += "  %-20s\t\t%s\n" % ("ModuleName", "ModuleVersion")
+        text += color_bold_text(
+            "red", "  %-20s\t\t%s\n" % ("ModuleName", "ModuleVersion"))
         text += "  %-20s\t\t%s\n" % ("--", "--")
         for module_name, module_version in module_list:
             text += "  %-20s\t\t%s\n" % (module_name, module_version)

paddle_hub/commands/show.py → paddlehub/commands/show.py

@@ -19,11 +19,11 @@ from __future__ import print_function
 import os
 import argparse
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.module.manager import default_module_manager
-from paddle_hub.module.module import Module
-from paddle_hub.io.reader import yaml_reader
+from paddlehub.common.logger import logger
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+from paddlehub.module.manager import default_module_manager
+from paddlehub.module.module import Module
+from paddlehub.io.reader import yaml_reader
 
 
 class ShowCommand(BaseCommand):

paddle_hub/commands/uninstall.py → paddlehub/commands/uninstall.py

@@ -18,10 +18,10 @@ from __future__ import print_function
 
 import argparse
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.module.manager import default_module_manager
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.module.manager import default_module_manager
+from paddlehub.commands.base_command import BaseCommand, ENTRY
 
 
 class UninstallCommand(BaseCommand):

paddle_hub/commands/version.py → paddlehub/commands/version.py

@@ -16,9 +16,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub import version
+from paddlehub.common.logger import logger
+from paddlehub import version
+from paddlehub.commands.base_command import BaseCommand
 
 
 class VersionCommand(BaseCommand):

paddle_hub/common/arg_helper.py → paddlehub/common/arg_helper.py

@@ -15,10 +15,12 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
+
 import six
 import distutils.util
 
+from paddlehub.common.logger import logger
+
 
 def add_argument(argument, type, default, help, argparser, **kwargs):
     type = distutils.util.strtobool if type == bool else type

paddle_hub/common/downloader.py → paddlehub/common/downloader.py

@@ -26,9 +26,9 @@ import requests
 import tempfile
 import tarfile
 
-from paddle_hub.common import utils
-from paddle_hub.common.logger import logger
-from paddle_hub.io.reader import csv_reader
+from paddlehub.common import utils
+from paddlehub.common.logger import logger
+from paddlehub.io.reader import csv_reader
 
 __all__ = ['Downloader']
 FLUSH_INTERVAL = 0.1

paddle_hub/common/hub_server.py → paddlehub/common/hub_server.py

@@ -15,12 +15,14 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.io.reader import csv_reader
+
 import os
 import time
-import paddle_hub as hub
+
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.io.reader import csv_reader
+import paddlehub as hub
 
 MODULE_LIST_FILE = "module_list_file.csv"
 MODEL_LIST_FILE = "model_list_file.csv"

paddle_hub/common/logger.py → paddlehub/common/logger.py

@@ -15,6 +15,7 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import print_function
+
 import logging
 import math
 

paddle_hub/common/paddle_helper.py → paddlehub/common/paddle_helper.py

@@ -15,13 +15,15 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from ..module import module_desc_pb2
-from .utils import from_pyobj_to_module_attr, from_module_attr_to_pyobj
-from .logger import logger
+
 import paddle
 import paddle.fluid as fluid
 import copy
 
+from paddlehub.module import module_desc_pb2
+from paddlehub.common.utils import from_pyobj_to_module_attr, from_module_attr_to_pyobj
+from paddlehub.common.logger import logger
+
 
 def get_variable_info(var):
     assert isinstance(

paddle_hub/common/utils.py → paddlehub/common/utils.py

@@ -12,18 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# coding=utf-8
-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.module import module_desc_pb2
-from paddle_hub.common.logger import logger
-import paddle
-import paddle.fluid as fluid
+
 import os
 import hashlib
 
+import paddle
+import paddle.fluid as fluid
+
+from paddlehub.module import module_desc_pb2
+from paddlehub.common.logger import logger
+
 
 def to_list(input):
     if not isinstance(input, list):

paddle_hub/dataset/base_cv_dataset.py → paddlehub/dataset/base_cv_dataset.py

@@ -18,8 +18,8 @@ from __future__ import print_function
 
 import os
 
-import paddle_hub as hub
-from paddle_hub.common.downloader import default_downloader
+import paddlehub as hub
+from paddlehub.common.downloader import default_downloader
 
 
 class ImageClassificationDataset:

paddle_hub/dataset/chnsenticorp.py → paddlehub/dataset/chnsenticorp.py

@@ -12,15 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.dir import DATA_HOME
-
+from collections import namedtuple
 import os
 import csv
 
-from paddle_hub.dataset import InputExample
-from paddle_hub.dataset import HubDataset
-from collections import namedtuple
+from paddlehub.dataset import InputExample
+from paddlehub.dataset import HubDataset
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.dir import DATA_HOME
 
 DATA_URL = "https://paddlehub-dataset.bj.bcebos.com/chnsenticorp_data.tar.gz"
 

paddle_hub/dataset/dogcat.py → paddlehub/dataset/dogcat.py

@@ -18,8 +18,8 @@ from __future__ import print_function
 
 import os
 
-import paddle_hub as hub
-from paddle_hub.dataset.base_cv_dataset import ImageClassificationDataset
+import paddlehub as hub
+from paddlehub.dataset.base_cv_dataset import ImageClassificationDataset
 
 
 class DogCatDataset(ImageClassificationDataset):

paddle_hub/dataset/flowers.py → paddlehub/dataset/flowers.py

@@ -18,8 +18,8 @@ from __future__ import print_function
 
 import os
 
-import paddle_hub as hub
-from paddle_hub.dataset.base_cv_dataset import ImageClassificationDataset
+import paddlehub as hub
+from paddlehub.dataset.base_cv_dataset import ImageClassificationDataset
 
 
 class FlowersDataset(ImageClassificationDataset):

paddle_hub/dataset/msra_ner.py → paddlehub/dataset/msra_ner.py

@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.dir import DATA_HOME
-
 import os
 import csv
 import json
 from collections import namedtuple
 
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.dir import DATA_HOME
+
 DATA_URL = "https://paddlehub-dataset.bj.bcebos.com/msra_ner.tar.gz"
 
 

paddle_hub/finetune/checkpoint.py → paddlehub/finetune/checkpoint.py

@@ -20,8 +20,8 @@ import os
 
 import paddle.fluid as fluid
 
-from paddle_hub.finetune import checkpoint_pb2
-from paddle_hub.common.logger import logger
+from paddlehub.finetune import checkpoint_pb2
+from paddlehub.common.logger import logger
 
 CKPT_FILE_NAME = "ckpt.meta"
 

paddle_hub/finetune/config.py → paddlehub/finetune/config.py

@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import time
-
-from .strategy import DefaultStrategy
 from datetime import datetime
+import time
 
-from paddle_hub.common.logger import logger
+from paddlehub.finetune.strategy import DefaultStrategy
+from paddlehub.common.logger import logger
 
 
 class RunConfig(object):

paddle_hub/finetune/finetune.py → paddlehub/finetune/finetune.py

@@ -22,12 +22,12 @@ import multiprocessing
 
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
-from visualdl import LogWriter
 
-from paddle_hub.common.logger import logger
-from paddle_hub.finetune.strategy import BERTFinetuneStrategy, DefaultStrategy
-from paddle_hub.finetune.checkpoint import load_checkpoint, save_checkpoint
+from paddlehub.common.logger import logger
+from paddlehub.finetune.strategy import BERTFinetuneStrategy, DefaultStrategy
+from paddlehub.finetune.checkpoint import load_checkpoint, save_checkpoint
+from visualdl import LogWriter
+import paddlehub as hub
 
 
 def _get_running_device_info(config):

paddle_hub/finetune/network.py → paddlehub/finetune/network.py

@@ -14,12 +14,13 @@
 
 import os
 import collections
-import paddle.fluid as fluid
 import time
-import numpy as np
 import multiprocessing
 
-from .task import Task
+import numpy as np
+import paddle.fluid as fluid
+
+from paddlehub.finetune.task import Task
 
 __all__ = ['append_mlp_classifier']
 

paddle_hub/finetune/strategy.py → paddlehub/finetune/strategy.py

@@ -16,7 +16,7 @@ import os
 import multiprocessing
 import paddle.fluid as fluid
 
-from .optimization import adam_weight_decay_optimization
+from paddlehub.finetune.optimization import adam_weight_decay_optimization
 
 
 def get_pretrained_parameter(main_program, start_program):

paddle_hub/finetune/task.py → paddlehub/finetune/task.py

@@ -14,11 +14,12 @@
 
 import os
 import collections
-import paddle.fluid as fluid
 import time
-import numpy as np
 import multiprocessing
 
+import numpy as np
+import paddle.fluid as fluid
+
 
 class Task(object):
     def __init__(self, task_type, graph_var_dict, main_program,

paddle_hub/io/augmentation.py → paddlehub/io/augmentation.py

@@ -15,10 +15,12 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
+
 from PIL import Image, ImageEnhance
-from paddle_hub.common import utils
 import numpy as np
 
+from paddlehub.common import utils
+
 
 def _check_range_0_1(value):
     value = value if value <= 1 else 1

paddle_hub/io/type.py → paddlehub/io/type.py

@@ -13,9 +13,11 @@
 # limitations under the License.
 
 from enum import Enum
+
 from PIL import Image
-from paddle_hub.common.logger import logger
-from paddle_hub.common import utils
+
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
 
 
 class DataType(Enum):

paddle_hub/module/checker.py → paddlehub/module/checker.py

@@ -14,12 +14,15 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.module import check_info_pb2
-from paddle_hub.version import hub_version, module_proto_version
+
 import os
+
 import paddle
 
+from paddlehub.common.logger import logger
+from paddlehub.module import check_info_pb2
+from paddlehub.version import hub_version, module_proto_version
+
 # check info
 CHECK_INFO_PB_FILENAME = "check_info.pb"
 FILE_SEP = "/"

paddle_hub/module/manager.py → paddlehub/module/manager.py

@@ -19,10 +19,10 @@ from __future__ import print_function
 import os
 import shutil
 
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.dir import MODULE_HOME
-import paddle_hub as hub
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.dir import MODULE_HOME
+import paddlehub as hub
 
 
 class LocalModuleManager:

paddle_hub/module/module.py → paddlehub/module/module.py

@@ -25,18 +25,18 @@ from shutil import copyfile
 import paddle
 import paddle.fluid as fluid
 
-from paddle_hub.common import utils
-from paddle_hub.common import paddle_helper
-from paddle_hub.common.logger import logger
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.module import module_desc_pb2
-from paddle_hub.module import check_info_pb2
-from paddle_hub.module.signature import Signature, create_signature
-from paddle_hub.module.checker import ModuleChecker
-from paddle_hub.module.manager import default_module_manager
-from paddle_hub.module.base_processor import BaseProcessor
-from paddle_hub.io.reader import yaml_reader
-from paddle_hub import version
+from paddlehub.common import utils
+from paddlehub.common import paddle_helper
+from paddlehub.common.logger import logger
+from paddlehub.common.downloader import default_downloader
+from paddlehub.module import module_desc_pb2
+from paddlehub.module import check_info_pb2
+from paddlehub.module.signature import Signature, create_signature
+from paddlehub.module.checker import ModuleChecker
+from paddlehub.module.manager import default_module_manager
+from paddlehub.module.base_processor import BaseProcessor
+from paddlehub.io.reader import yaml_reader
+from paddlehub import version
 
 __all__ = ['Module', 'create_module']
 

paddle_hub/module/signature.py → paddlehub/module/signature.py

@@ -15,8 +15,10 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
+
 from paddle.fluid.framework import Variable
-from paddle_hub.common.utils import to_list
+
+from paddlehub.common.utils import to_list
 
 
 class Signature:

paddle_hub/reader/cv_reader.py → paddlehub/reader/cv_reader.py

@@ -20,7 +20,7 @@ import paddle
 import numpy as np
 from PIL import Image
 
-import paddle_hub.io.augmentation as image_augmentation
+import paddlehub.io.augmentation as image_augmentation
 
 color_mode_dict = {
     "RGB": [0, 1, 2],

paddle_hub/reader/nlp_reader.py → paddlehub/reader/nlp_reader.py

@@ -17,9 +17,9 @@ import types
 import csv
 import numpy as np
 
-#from paddle_hub import dataset
-from paddle_hub.reader import tokenization
-from .batching import prepare_batch_data
+#from paddlehub import dataset
+from paddlehub.reader import tokenization
+from paddlehub.reader.batching import prepare_batch_data
 
 
 class BERTTokenizeReader(object):

scripts/gen_proto.sh

 #/bin/bash
-protoc -I=../paddle_hub/module --python_out=../paddle_hub/module ../paddle_hub/module/module_desc.proto
-protoc -I=../paddle_hub/module --python_out=../paddle_hub/module ../paddle_hub/module/check_info.proto
-protoc -I=../paddle_hub/finetune --python_out=../paddle_hub/finetune ../paddle_hub/finetune/checkpoint.proto
+protoc -I=../paddlehub/module --python_out=../paddlehub/module ../paddlehub/module/module_desc.proto
+protoc -I=../paddlehub/module --python_out=../paddlehub/module ../paddlehub/module/check_info.proto
+protoc -I=../paddlehub/finetune --python_out=../paddlehub/finetune ../paddlehub/finetune/checkpoint.proto

setup.py

@@ -18,14 +18,14 @@ from __future__ import print_function
 
 from setuptools import find_packages
 from setuptools import setup
-from paddle_hub.version import hub_version
+from paddlehub.version import hub_version
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.12.0', 'six >= 1.10.0', 'protobuf >= 3.1.0', 'pyyaml', 'numpy'
 ]
 
 setup(
-    name='paddle_hub',
+    name='paddlehub',
     version=hub_version.replace('-', ''),
     description=('PaddleHub is a library to foster the publication, '
                  'discovery, and consumption of reusable parts of machine '
@@ -56,5 +56,5 @@ setup(
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     license='Apache 2.0',
-    keywords=('paddlepaddle pretrained paddle-hub'),
-    entry_points={'console_scripts': ['hub=paddle_hub.commands.hub:main']})
+    keywords=('paddlepaddle pretrained paddlehub'),
+    entry_points={'console_scripts': ['hub=paddlehub.commands.hub:main']})

tests/test_downloader.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 
 
 class TestDownloader(unittest.TestCase):

tests/test_export_n_load_module.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 import numpy as np
 import paddle.fluid as fluid
 import paddle
-import paddle_hub as hub
+import paddlehub as hub
 import unittest
 import os
 

tests/test_module.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
 
 

tests/test_param_serialize.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
-from paddle_hub.paddle_helper import from_param_to_flexible_data, from_flexible_data_to_param
-from paddle_hub import module_desc_pb2
-from paddle_hub.logger import logger
+from paddlehub.paddle_helper import from_param_to_flexible_data, from_flexible_data_to_param
+from paddlehub import module_desc_pb2
+from paddlehub.logger import logger
 
 
 class TestParamAttrSerializeAndDeSerialize(unittest.TestCase):

tests/test_pyobj_serialize.py

@@ -15,11 +15,11 @@
 import sys
 import math
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
-from paddle_hub.utils import from_pyobj_to_flexible_data, from_flexible_data_to_pyobj, get_pykey
-from paddle_hub import module_desc_pb2
-from paddle_hub.logger import logger
+from paddlehub.utils import from_pyobj_to_flexible_data, from_flexible_data_to_pyobj, get_pykey
+from paddlehub import module_desc_pb2
+from paddlehub.logger import logger
 
 
 def _compare_float(a, b):

tests/test_signature.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
-from paddle_hub import create_signature
+from paddlehub import create_signature
 
 
 class TestSignature(unittest.TestCase):

tests/test_train_w2v.py

@@ -5,7 +5,7 @@ from __future__ import print_function
 
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
+import paddlehub as hub
 import unittest
 import os