From 40aed2414c19d6e0c9aca96ab9c15629bc90966c Mon Sep 17 00:00:00 2001 From: liuqi Date: Tue, 29 May 2018 09:09:09 +0800 Subject: [PATCH] Fix in/out file name in python code not match c++ format. --- tools/common.py | 6 ++++-- tools/generate_data.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/common.py b/tools/common.py index e07fe933..b708fc50 100644 --- a/tools/common.py +++ b/tools/common.py @@ -44,5 +44,7 @@ class CaffeEnvType(enum.Enum): # common functions ################################ def formatted_file_name(input_file_name, input_name): - return input_file_name + '_' + \ - re.sub('[^0-9a-zA-Z]+', '_', input_name) + res = input_file_name + '_' + for c in input_name: + res += c if c.isalnum() else '_' + return res diff --git a/tools/generate_data.py b/tools/generate_data.py index 668838bc..747f0c23 100644 --- a/tools/generate_data.py +++ b/tools/generate_data.py @@ -16,6 +16,7 @@ import argparse import sys import numpy as np import re +import common # Validation Flow: # 1. Generate input data @@ -29,8 +30,7 @@ import re def generate_data(name, shape, input_file): np.random.seed() data = np.random.random(shape) * 2 - 1 - input_file_name = input_file + "_" + re.sub('[^0-9a-zA-Z]+', '_', - name) + input_file_name = common.formatted_file_name(input_file, name) print 'Generate input file: ', input_file_name data.astype(np.float32).tofile(input_file_name) -- GitLab