From 17bab6a2d15a392468c24d4eed7c45d98b09ddbc Mon Sep 17 00:00:00 2001 From: JesseyXujin Date: Wed, 25 Dec 2019 19:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9paddle=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E9=94=99=E6=9C=BA=E5=88=B6=20(#790)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jieba/_compat.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/jieba/_compat.py b/jieba/_compat.py index d0adb74..5aaee84 100755 --- a/jieba/_compat.py +++ b/jieba/_compat.py @@ -25,12 +25,18 @@ def import_paddle(): import_paddle_check = False try: import paddle + except ImportError: + default_logger.debug("Import paddle error, please use command to install: pip install paddlepaddle-tiny==1.6.1. " + "Now, back to jieba basic cut......") + return False + try: if paddle.__version__ >= '1.6.1' or paddle.__version__ >= u'1.6.1': import paddle.fluid as fluid import jieba.lac_small.predict as predict - import_paddle_check = True + import_paddle_check = True except ImportError: - default_logger.debug("Import paddle error, please use command to install: pip install paddlepaddle-tiny==1.6.1. Now, back to jieba basic cut......") + default_logger.debug("Import error, cannot find paddle.fluid and jieba.lac_small.predict module. " + "Now, back to jieba basic cut......") return False return import_paddle_check @@ -79,10 +85,10 @@ def check_paddle_install(): is_paddle_installed = True elif paddle.__version__ < '1.6.1': is_paddle_installed = False - default_logger.debug("Check the paddle version is not correct, please\ - use command to install paddle: pip uninstall paddlepaddle(-gpu), \ - pip install paddlepaddle-tiny==1.6.1. Now, back to jieba basic cut......") + default_logger.debug("Check the paddle version is not correct, the current version is "+ paddle.__version__+"," + "please use command to install paddle: pip uninstall paddlepaddle(-gpu), " + "pip install paddlepaddle-tiny==1.6.1. Now, back to jieba basic cut......") except ImportError: - default_logger.debug("import paddle error, back to jieba basic cut......") + default_logger.debug("Import paddle error, back to jieba basic cut......") is_paddle_installed = False return is_paddle_installed