fix reference bug

paddle_hub/commands/base_command.py

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

paddle_hub/commands/download.py

@@ -15,11 +15,11 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.tools.logger import logger
+from paddle_hub.common.logger import logger
 from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.tools import utils
-from paddle_hub.tools.downloader import default_downloader
-from paddle_hub.hub_server import default_hub_server
+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
 
 

paddle_hub/commands/hub.py

@@ -15,7 +15,7 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.tools.logger import logger
+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

paddle_hub/commands/install.py

@@ -17,9 +17,9 @@ from __future__ import print_function
 
 import argparse
 
-from paddle_hub.tools.logger import logger
+from paddle_hub.common.logger import logger
 from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.tools import utils
+from paddle_hub.common import utils
 from paddle_hub.module.manager import default_module_manager
 
 

paddle_hub/commands/list.py

@@ -16,10 +16,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.tools.logger import logger
+from paddle_hub.common.logger import logger
 from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub.tools import utils
-from paddle_hub.tools.downloader import default_downloader
+from paddle_hub.common import utils
+from paddle_hub.common.downloader import default_downloader
 from paddle_hub.module.manager import default_module_manager
 
 

paddle_hub/commands/run.py

@@ -16,12 +16,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.tools.logger import logger
+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.tools import utils
-from paddle_hub.tools.arg_helper import add_argument, print_arguments
+from paddle_hub.common import utils
+from paddle_hub.common.arg_helper import add_argument, print_arguments
 
 import paddle_hub as hub
 import argparse

paddle_hub/commands/search.py

@@ -15,10 +15,10 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.tools.logger import logger
+from paddle_hub.common.logger import logger
 from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.tools import utils
-from paddle_hub.hub_server import default_hub_server
+from paddle_hub.common import utils
+from paddle_hub.common.hub_server import default_hub_server
 import argparse
 
 

paddle_hub/commands/show.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 import os
 import argparse
 
-from paddle_hub.tools.logger import logger
+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

paddle_hub/commands/uninstall.py

@@ -18,9 +18,9 @@ from __future__ import print_function
 
 import argparse
 
-from paddle_hub.tools.logger import logger
+from paddle_hub.common.logger import logger
 from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.tools import utils
+from paddle_hub.common import utils
 from paddle_hub.module.manager import default_module_manager
 
 

paddle_hub/commands/version.py

@@ -16,7 +16,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.tools.logger import logger
+from paddle_hub.common.logger import logger
 from paddle_hub.commands.base_command import BaseCommand
 from paddle_hub import version
 

paddle_hub/dataset/base_cv_dataset.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 import os
 
 import paddle_hub as hub
-from paddle_hub.tools.downloader import default_downloader
+from paddle_hub.common.downloader import default_downloader
 
 
 class ImageClassificationDataset:

paddle_hub/dataset/dogcat.py

@@ -25,7 +25,7 @@ from paddle_hub.dataset.base_cv_dataset import ImageClassificationDataset
 class DogCatDataset(ImageClassificationDataset):
     def __init__(self):
         super(DogCatDataset, self).__init__()
-        dataset_path = os.path.join(hub.dir.DATA_HOME, "dog-cat")
+        dataset_path = os.path.join(hub.common.dir.DATA_HOME, "dog-cat")
         self.base_path = self._download_dataset(
             dataset_path=dataset_path,
             url="https://paddlehub-dataset.bj.bcebos.com/dog-cat.tar.gz")

paddle_hub/dataset/flowers.py

@@ -25,7 +25,7 @@ from paddle_hub.dataset.base_cv_dataset import ImageClassificationDataset
 class FlowersDataset(ImageClassificationDataset):
     def __init__(self):
         super(FlowersDataset, self).__init__()
-        dataset_path = os.path.join(hub.dir.DATA_HOME, "flower_photos")
+        dataset_path = os.path.join(hub.common.dir.DATA_HOME, "flower_photos")
         self.base_path = self._download_dataset(
             dataset_path=dataset_path,
             url="https://paddlehub-dataset.bj.bcebos.com/flower_photos.tar.gz")

paddle_hub/finetune/config.py

@@ -102,5 +102,5 @@ class FinetuneConfig(object):
         return self._enable_memory_optim
 
     @property
-    def optimier(self):
+    def optimizer(self):
         return self._optimizer

paddle_hub/dataset/cv_reader.py → paddle_hub/reader/cv_reader.py

@@ -57,7 +57,7 @@ class ImageClassificationReader:
         elif phase == "test":
             shuffle = False
             data = self.dataset.test_data(shuffle)
-        elif phase == "validate":
+        elif phase == "val" or phase == "dev":
             shuffle = False
             data = self.dataset.validate_data(shuffle)