compute-variability.py: Cast values to float to avoid internal python error in np.isnan()

Also specify the order of the columns in the outputed csv file. This is
useful for parsing this file in lnt-utils.sh

Change-Id: I6e6339725958389820f2cfe7c7ac961f70094704

1 files changed, 5 insertions, 3 deletions

diff --git a/compute-variability.py b/compute-variability.py
index 6bf27cb..462e264 100755
--- a/compute-variability.py
+++ b/compute-variability.py
@@ -35,7 +35,7 @@ def parse_args():
 Routine to compute weighted average. """
 def compute_weighted_avg(weights, values):
     w = weights.transpose().iloc[0].to_numpy()
-    v = values.iloc[2:-1].to_numpy()
+    v = values.iloc[2:-1].astype("float").to_numpy()
     assert len(w) == len(v)
 
     if len(w) == 0:
@@ -135,9 +135,11 @@ def main():
         deviation = pd.merge(deviation, compute_variation_average(metric), \
            how="outer", on=["benchmark", "symbol"])
 
-    # Dump output
+    # Dump output and specify the column order
+    columns=['benchmark', 'symbol', 'sample_variation_average', 'size_variation_average', \
+             'num_sve_loops_variation_average', 'num_vect_loops_variation_average']
     print("Printing output to : " + args.output)
-    deviation.to_csv(args.output, index=False)
+    deviation.to_csv(args.output, columns=columns, index=False)
 
 if __name__ == "__main__":
     main()