From 8e130a932f4bd950537136d1c9dde98c44a3e741 Mon Sep 17 00:00:00 2001 From: SunAhong1993 Date: Wed, 4 Sep 2019 11:26:23 +0800 Subject: [PATCH] check protobuf --- x2paddle/convert.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/x2paddle/convert.py b/x2paddle/convert.py index 7010828..5f9de67 100644 --- a/x2paddle/convert.py +++ b/x2paddle/convert.py @@ -122,14 +122,8 @@ def caffe2paddle(proto, weight, save_dir, caffe_proto): from x2paddle.decoder.caffe_decoder import CaffeDecoder from x2paddle.op_mapper.caffe_op_mapper import CaffeOpMapper from x2paddle.optimizer.caffe_optimizer import CaffeOptimizer - s = sys.version - if s.startswith('2'): - import commands - pb_version = commands.getstatusoutput('pip list | grep protobuf')[1] - else: - import subprocess - pb_version = subprocess.getstatusoutput('pip list | grep protobuf')[1] - ver_str = pb_version.replace(' ', '').split('protobuf')[-1].replace('.', '') + import google.protobuf as gpb + ver_str = gpb.__version__.replace('.', '') ver_int = int(ver_str) assert ver_int >= 360, 'The version of protobuf must be larger than 3.6.0!' print("Now translating model from caffe to paddle.") -- GitLab