aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/playbooks/result_transform/dpi/dpi_transform.py')
-rw-r--r--benchmarks/playbooks/result_transform/dpi/dpi_transform.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/benchmarks/playbooks/result_transform/dpi/dpi_transform.py b/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
index 2aa45757..b95e0e23 100644
--- a/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
+++ b/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
@@ -46,9 +46,4 @@ result = {}
result['DPI_benchmark(M pps)'] = round(dpi_result_pps, 3)
result['DPI_benchmark(Gb/s)'] = round(dpi_result_bps, 3)
with open('./result_temp', 'w+') as result_file:
- pickle.dump(result, result_file)
-<<<<<<< HEAD
-
-=======
-print json.dumps(result, indent=4, sort_keys=True)
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
+ pickle.dump(result, result_file) \ No newline at end of file