diff --git a/validate.py b/validate.py index 6f27383fefa61458336afc3078b2d8be3b46cf9c..758f7cfdb8818cfe5a4868b6c0dda3de6beefbb7 100644 --- a/validate.py +++ b/validate.py @@ -28,10 +28,10 @@ def load_data(file): def format_output_name(name): return re.sub('[^0-9a-zA-Z]+', '_', name) -def compare_output(mace_out_value, out_value): +def compare_output(output_name, mace_out_value, out_value): if mace_out_value.size != 0: similarity = (1 - spatial.distance.cosine(out_value.flat, mace_out_value.flat)) - print 'MACE VS TF similarity: ', similarity + print output_name, 'MACE VS', FLAGS.platform.upper(), 'similarity: ', similarity if (FLAGS.mace_runtime == "cpu" and similarity > 0.999) or \ (FLAGS.mace_runtime == "gpu" and similarity > 0.995) or \ (FLAGS.mace_runtime == "dsp" and similarity > 0.930): @@ -71,7 +71,7 @@ def validate_tf_model(input_names, input_shapes, output_names): for i in range(len(output_names)): output_file_name = FLAGS.mace_out_file + "_" + format_output_name(output_names[i]) mace_out_value = load_data(output_file_name) - compare_output(mace_out_value, output_values[i]) + compare_output(output_names[i], mace_out_value, output_values[i]) def validate_caffe_model(input_names, input_shapes, output_names, output_shapes): os.environ['GLOG_minloglevel'] = '1' # suprress Caffe verbose prints @@ -101,7 +101,7 @@ def validate_caffe_model(input_names, input_shapes, output_names, output_shapes) value = value.reshape(out_shape).transpose((0, 2, 3, 1)) output_file_name = FLAGS.mace_out_file + "_" + format_output_name(output_names[i]) mace_out_value = load_data(output_file_name) - compare_output(mace_out_value, value) + compare_output(output_names[i], mace_out_value, value) def main(unused_args): input_names = [name for name in FLAGS.input_node.split(',')] diff --git a/validate_tools.sh b/validate_tools.sh index fefbce489432865b62bf39dc1dd7f1f5878d9129..9468ea6e9c23f174785952be2fea3e62a4e45873 100644 --- a/validate_tools.sh +++ b/validate_tools.sh @@ -31,7 +31,7 @@ if [ "$GENERATE_DATA_OR_NOT" = 1 ]; then fi if [ "$PLATFORM" == "tensorflow" ];then - if [[ x"$TARGET_ABI" -ne x"host" ]]; then + if [[ x"$TARGET_ABI" != x"host" ]]; then for NAME in "${OUTPUT_NAMES[@]}";do FORMATTED_NAME=$(sed s/[^[:alnum:]]/_/g <<< ${NAME}) rm -rf ${MODEL_OUTPUT_DIR}/${OUTPUT_FILE_NAME}_${FORMATTED_NAME} @@ -73,14 +73,17 @@ elif [ "$PLATFORM" == "caffe" ];then docker cp ${MODEL_OUTPUT_DIR}/${INPUT_FILE_NAME}_${FORMATTED_NAME} ${CONTAINER_NAME}:/mace done - if [[ x"$TARGET_ABI" -ne x"host" ]]; then + if [[ x"$TARGET_ABI" != x"host" ]]; then for NAME in "${OUTPUT_NAMES[@]}";do FORMATTED_NAME=$(sed s/[^[:alnum:]]/_/g <<< ${NAME}) rm -rf ${MODEL_OUTPUT_DIR}/${OUTPUT_FILE_NAME}_${FORMATTED_NAME} - adb