Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleHub
提交
71d0cc9d
P
PaddleHub
项目概览
PaddlePaddle
/
PaddleHub
大约 1 年 前同步成功
通知
282
Star
12117
Fork
2091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
200
列表
看板
标记
里程碑
合并请求
4
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleHub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
200
Issue
200
列表
看板
标记
里程碑
合并请求
4
合并请求
4
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
71d0cc9d
编写于
2月 26, 2021
作者:
W
wuzewu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add verification of PaddlePaddle version and fix PaddleX download problem.
上级
81cf07b2
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
14 addition
and
4 deletion
+14
-4
paddlehub/__init__.py
paddlehub/__init__.py
+9
-2
paddlehub/utils/paddlex.py
paddlehub/utils/paddlex.py
+5
-2
未找到文件。
paddlehub/__init__.py
浏览文件 @
71d0cc9d
...
@@ -13,12 +13,19 @@
...
@@ -13,12 +13,19 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
__version__
=
'2.0.1'
import
paddle
from
packaging.version
import
Version
_paddle_version
=
Version
(
paddle
.
__version__
)
if
_paddle_version
<
Version
(
'2.0.0'
):
raise
RuntimeError
(
'Version mismatch in PaddleHub and PaddlePaddle, you need to upgrade PaddlePaddle to version 2.0.0 or above.'
)
import
sys
import
sys
from
easydict
import
EasyDict
from
easydict
import
EasyDict
__version__
=
'2.0.0'
from
paddlehub
import
env
from
paddlehub
import
env
from
paddlehub.config
import
config
from
paddlehub.config
import
config
from
paddlehub
import
datasets
from
paddlehub
import
datasets
...
...
paddlehub/utils/paddlex.py
浏览文件 @
71d0cc9d
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
import
os
import
os
import
shutil
import
shutil
from
paddlehub.server.server
import
module_server
from
paddlehub.server.server
import
module_server
,
CacheUpdater
from
paddlehub.utils
import
log
,
utils
,
xarfile
from
paddlehub.utils
import
log
,
utils
,
xarfile
...
@@ -35,12 +35,15 @@ class ResourceNotFoundError(Exception):
...
@@ -35,12 +35,15 @@ class ResourceNotFoundError(Exception):
def
download
(
name
:
str
,
save_path
:
str
,
version
:
str
=
None
):
def
download
(
name
:
str
,
save_path
:
str
,
version
:
str
=
None
):
'''The download interface provided to PaddleX for downloading the specified model and resource files.'''
'''The download interface provided to PaddleX for downloading the specified model and resource files.'''
CacheUpdater
(
"x_download"
,
name
,
version
).
start
()
file
=
os
.
path
.
join
(
save_path
,
name
)
file
=
os
.
path
.
join
(
save_path
,
name
)
file
=
os
.
path
.
realpath
(
file
)
file
=
os
.
path
.
realpath
(
file
)
if
os
.
path
.
exists
(
file
):
if
os
.
path
.
exists
(
file
):
return
return
resources
=
module_server
.
search_resouce
(
name
=
name
,
version
=
version
,
type
=
'Model'
)
resources
=
module_server
.
search_resou
r
ce
(
name
=
name
,
version
=
version
,
type
=
'Model'
)
if
not
resources
:
if
not
resources
:
raise
ResourceNotFoundError
(
name
,
version
)
raise
ResourceNotFoundError
(
name
,
version
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录