Skip to content

Commit 70a24ad

Browse files
committed
replace print in run_pretrained_models.py
1 parent 2a86120 commit 70a24ad

File tree

1 file changed

+23
-30
lines changed

1 file changed

+23
-30
lines changed

tests/run_pretrained_models.py

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import sys
1414
import tarfile
1515
import time
16-
import traceback
1716
import zipfile
1817

1918
import PIL.Image
@@ -186,7 +185,7 @@ def run_onnxruntime(self, name, model_proto, inputs):
186185
"""Run test against msrt-next backend."""
187186
import onnxruntime as rt
188187
model_path = utils.save_onnx_model(TEMP_DIR, name, inputs, model_proto, include_test_data=True)
189-
print("\t\t" + model_path)
188+
logger.info("Model saved to %s", model_path)
190189
m = rt.InferenceSession(model_path)
191190
results = m.run(self.output_names, inputs)
192191
if self.perf:
@@ -201,12 +200,13 @@ def create_onnx_file(name, model_proto, inputs, outdir):
201200
os.makedirs(outdir, exist_ok=True)
202201
model_path = os.path.join(outdir, name + ".onnx")
203202
utils.save_protobuf(model_path, model_proto)
204-
print("\tcreated", model_path)
203+
logger.info("Created %s", model_path)
205204

206205
def run_test(self, name, backend="caffe2", onnx_file=None, opset=None, extra_opset=None,
207206
perf=None, fold_const=None):
208207
"""Run complete test against backend."""
209-
print(name)
208+
logger.info("===================================")
209+
logger.info("Running %s", name)
210210
self.perf = perf
211211

212212
# get the model
@@ -216,7 +216,7 @@ def run_test(self, name, backend="caffe2", onnx_file=None, opset=None, extra_ops
216216
else:
217217
model_path = self.local
218218
dir_name = os.path.dirname(self.local)
219-
print("\tdownloaded", model_path)
219+
logger.info("Downloaded to %s", model_path)
220220

221221
input_names = list(self.input_names.keys())
222222
outputs = self.output_names
@@ -261,29 +261,24 @@ def run_test(self, name, backend="caffe2", onnx_file=None, opset=None, extra_ops
261261

262262
# run the model with tensorflow
263263
if self.skip_tensorflow:
264-
print("\ttensorflow", "SKIPPED")
264+
logger.info("TensorFlow SKIPPED")
265265
else:
266266
tf_results = self.run_tensorflow(sess, inputs)
267-
print("\ttensorflow", "OK")
267+
logger.info("TensorFlow OK")
268268
model_proto = None
269269
try:
270270
# convert model to onnx
271271
onnx_graph = self.to_onnx(sess.graph, opset=opset, extra_opset=extra_opset,
272272
shape_override=shape_override, input_names=inputs.keys())
273273
model_proto = onnx_graph.make_model("converted from tf2onnx")
274-
new_model_proto = optimizer.optimize_graph(onnx_graph).make_model("optimized")
275-
if new_model_proto:
276-
model_proto = new_model_proto
277-
else:
278-
print("\tNON-CRITICAL, optimizers are not applied successfully")
279-
print("\tto_onnx", "OK")
274+
model_proto = optimizer.optimize_graph(onnx_graph).make_model("optimized")
275+
logger.info("To_ONNX, OK")
280276
if utils.is_debug_mode():
281277
onnx_graph.dump_graph()
282278
if onnx_file:
283279
self.create_onnx_file(name, model_proto, inputs, onnx_file)
284-
except Exception as ex:
285-
tb = traceback.format_exc()
286-
print("\tto_onnx", "FAIL", ex, tb)
280+
except Exception:
281+
logger.error("To_ONNX FAIL", exc_info=1)
287282

288283
try:
289284
onnx_results = None
@@ -295,27 +290,25 @@ def run_test(self, name, backend="caffe2", onnx_file=None, opset=None, extra_ops
295290
onnx_results = self.run_onnxruntime(name, model_proto, inputs)
296291
else:
297292
raise ValueError("unknown backend")
298-
print("\trun_onnx OK")
293+
logger.info("Run_ONNX OK")
299294

300295
try:
301296
if self.skip_tensorflow:
302-
print("\tResults: skipped tensorflow")
297+
logger.info("Results: skipped tensorflow")
303298
else:
304299
if self.check_only_shape:
305300
for tf_res, onnx_res in zip(tf_results, onnx_results):
306301
np.testing.assert_array_equal(tf_res.shape, onnx_res.shape)
307302
else:
308303
for tf_res, onnx_res in zip(tf_results, onnx_results):
309304
np.testing.assert_allclose(tf_res, onnx_res, rtol=self.rtol, atol=self.atol)
310-
print("\tResults: OK")
305+
logger.info("Results: OK")
311306
return True
312-
except Exception as ex:
313-
tb = traceback.format_exc()
314-
print("\tResults", ex, tb)
307+
except Exception:
308+
logger.error("Results", exc_info=1)
315309

316-
except Exception as ex:
317-
tb = traceback.format_exc()
318-
print("\trun_onnx", "FAIL", ex, tb)
310+
except Exception:
311+
logger.error("Run_ONNX FAIL", exc_info=1)
319312

320313
return False
321314

@@ -379,7 +372,7 @@ def main():
379372
Test.target = args.target
380373
tests = tests_from_yaml(args.config)
381374
if args.list:
382-
print(sorted(tests.keys()))
375+
logger.info(sorted(tests.keys()))
383376
return 0
384377
if args.tests:
385378
test_keys = args.tests.split(",")
@@ -397,17 +390,17 @@ def main():
397390
ret = t.run_test(test, backend=args.backend, onnx_file=args.onnx_file,
398391
opset=args.opset, extra_opset=args.extra_opset, perf=args.perf,
399392
fold_const=args.fold_const)
400-
except Exception as ex:
393+
except Exception:
394+
logger.error("Failed to run %s", test, exc_info=1)
401395
ret = None
402-
tb = traceback.format_exc()
403-
print(ex, tb)
404396
finally:
405397
if not utils.is_debug_mode():
406398
utils.delete_directory(TEMP_DIR)
407399
if not ret:
408400
failed += 1
409401

410-
print("=== RESULT: {} failed of {}, backend={}".format(failed, count, args.backend))
402+
logger.info("===================================")
403+
logger.info("RESULT: %s failed of %s, backend=%s", failed, count, args.backend)
411404

412405
if args.perf:
413406
with open(args.perf, "w") as f:

0 commit comments

Comments
 (0)