schihei/ascend-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixp ython 2 compatibility issues

Browse Source
This commit is contained in:
chen68
2020-08-11 02:37:23 -07:00
parent 6dcf15fc4b
commit 001a87e88c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
img2bin/img2bin.py
+12 -4
View File
@@ -55,7 +55,6 @@ except:
print('[info] Starting to install opencv-python...') print('[info] Starting to install opencv-python...')
if sys.version_info.major == 2: if sys.version_info.major == 2:
import commands import commands
import ConfigParser as configparser
ret, output = commands.getstatusoutput("sudo yum install -y opencv-python") ret, output = commands.getstatusoutput("sudo yum install -y opencv-python")
# ret = os.popen('sudo yum install -y opencv-python') # ret = os.popen('sudo yum install -y opencv-python')
if ret != 0: if ret != 0:
@@ -65,7 +64,6 @@ except:
print('[ERROR] install opencv-python failed,please check env.') print('[ERROR] install opencv-python failed,please check env.')
exit(0) exit(0)
else: else:
import configparser
ret = os.system('sudo python3.7.5 -m pip install opencv-python') ret = os.system('sudo python3.7.5 -m pip install opencv-python')
if ret != 0: if ret != 0:
print('[ERROR] install opencv-python failed,please check env.') print('[ERROR] install opencv-python failed,please check env.')
@@ -236,10 +234,19 @@ def mkdir_output(args):
def process(args, file_path): def process(args, file_path):
if file_path.endswith(".txt"): if file_path.endswith(".txt"):
if sys.version_info.major == 2:
import ConfigParser as configparser
else:
import configparser
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(file_path) config.read(file_path)
input_node = json.loads(config['baseconf']['input_node']) if sys.version_info.major == 2:
shape = json.loads(config['baseconf']['shape']) input_node = json.loads(config.get('baseconf', 'input_node'))
shape = json.loads(config.get('baseconf', 'shape'))
else:
input_node = json.loads(config['baseconf']['input_node'])
shape = json.loads(config['baseconf']['shape'])
input_node_np = np.array(input_node) input_node_np = np.array(input_node)
change_type_img_info = change_type(args, input_node_np) change_type_img_info = change_type(args, input_node_np)
img_info = np.reshape(change_type_img_info, shape) img_info = np.reshape(change_type_img_info, shape)
@@ -283,3 +290,4 @@ if __name__ == '__main__':
main() main()