Add geomean column earlier to dataout as Series in compare.py.
This fixes the following error when using --all.
Traceback (most recent call last):
File "test-suite/utils/compare.py", line 374, in <module>
print_result(data, limit_output, shorten_names, config.show_diff, sortkey)
File "test-suite/utils/compare.py", line 227, in print_result
dataout = add_geomean_row(d, dataout)
File "test-suite/utils/compare.py", line 139, in add_geomean_row
relative = values1 / values0
File "pyvenv/lib/python2.7/site-packages/pandas/core/ops.py", line 1583, in wrapper
result = safe_na_op(lvalues, rvalues)
File "pyvenv/lib/python2.7/site-packages/pandas/core/ops.py", line 1533, in safe_na_op
lambda x: op(x, rvalues))
File "pandas/_libs/algos.pyx", line 690, in pandas._libs.algos.arrmap
File "pyvenv/lib/python2.7/site-packages/pandas/core/ops.py", line 1533, in <lambda>
lambda x: op(x, rvalues))
TypeError: ufunc 'true_divide' not supported for the input types, and the inputs could not be safely coerced to any supported types according to the casting rule ''safe''
Reviewed By: paquette
Differential Revision: https://reviews.llvm.org/D64066
llvm-svn: 367002
diff --git a/utils/compare.py b/utils/compare.py
index 71f4215..2972cdd 100755
--- a/utils/compare.py
+++ b/utils/compare.py
@@ -141,8 +141,8 @@
gm_row = {c: '' for c in dataout.columns}
gm_row['diff'] = gm_diff
- gm_row['Program'] = 'Geomean difference'
- return dataout.append(gm_row, ignore_index=True)
+ series = pd.Series(gm_row, name='Geomean difference')
+ return dataout.append(series)
def filter_failed(data, key='Exec'):
return data.loc[data[key] == "pass"]
@@ -220,12 +220,12 @@
# Take 15 topmost elements
dataout = dataout.head(15)
+ if show_diff_column:
+ dataout = add_geomean_row(d, dataout)
+
# Turn index into a column so we can format it...
dataout.insert(0, 'Program', dataout.index)
- if show_diff_column:
- dataout = add_geomean_row(d, dataout)
-
formatters = dict()
formatters['diff'] = format_diff
if shorten_names:
