third_codes/jieba
1
0
Fork 0
mirror of https://github.com/fxsjy/jieba.git synced 2025-07-10 00:01:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Paddle import check (#795)

Browse Source
This commit is contained in:
JesseyXujin 2019-12-31 15:03:14 +08:00 committed by Sun Junyi
parent 0b74b6c2de
commit 30ea8f929e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jieba/_compat.py
View File

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
import sys import sys
import importlib
import logging import logging
log_console = logging.StreamHandler(sys.stderr) log_console = logging.StreamHandler(sys.stderr)
@ -30,7 +29,7 @@ def import_paddle():
"Now, back to jieba basic cut......") "Now, back to jieba basic cut......")
return False return False
try: try:
if paddle.__version__ >= '1.6.1' or paddle.__version__ >= u'1.6.1': if paddle.__version__ >= '1.6.1':
import paddle.fluid as fluid import paddle.fluid as fluid
import jieba.lac_small.predict as predict import jieba.lac_small.predict as predict
import_paddle_check = True import_paddle_check = True
@ -81,9 +80,9 @@ def check_paddle_install():
is_paddle_installed = False is_paddle_installed = False
try: try:
import paddle import paddle
if importlib.find_module('paddle') and (paddle.__version__ >= '1.6.1' or paddle.__version__ >= u'1.6.1'): if paddle.__version__ >= '1.6.1':
is_paddle_installed = True is_paddle_installed = True
elif paddle.__version__ < '1.6.1': else:
is_paddle_installed = False is_paddle_installed = False
default_logger.debug("Check the paddle version is not correct, the current version is "+ paddle.__version__+"," 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), " "please use command to install paddle: pip uninstall paddlepaddle(-gpu), "