提交 7ff7232e 编写于 作者: C channingss

resovle conflict of convert.py

上级 06ed45ce
...@@ -90,24 +90,6 @@ def tf2paddle(model_path, save_dir): ...@@ -90,24 +90,6 @@ def tf2paddle(model_path, save_dir):
def caffe2paddle(proto, weight, save_dir, caffe_proto): def caffe2paddle(proto, weight, save_dir, caffe_proto):
if caffe_proto is not None:
import os
if not os.path.isfile(caffe_proto + 'caffe_pb2.py'):
print("The file that resolve caffe is not exist.")
return
else:
try:
import caffe
version = caffe.__version__
if version != '1.0.0':
print("caffe == 1.0.0 is required")
return
except:
print("Caffe is not installed.")
print(
"You have 2 options: 1. install caffe 2. compile the caffe.proto"
)
return
from x2paddle.decoder.caffe_decoder import CaffeDecoder from x2paddle.decoder.caffe_decoder import CaffeDecoder
from x2paddle.op_mapper.caffe_op_mapper import CaffeOpMapper from x2paddle.op_mapper.caffe_op_mapper import CaffeOpMapper
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册