From 3744de522c3968b803b56f87e7272a05bb308001 Mon Sep 17 00:00:00 2001 From: Serge Guelton Date: Tue, 18 Dec 2018 08:38:50 +0000 Subject: [PATCH] Portable Python script across Python version In Python2, division between integer yields an integer, while it yields a float in Python3. Use a combination of from __future__ import division and // operator to get a portable behavior. Differential Revision: https://reviews.llvm.org/D55204 llvm-svn: 349455 --- clang/utils/ABITest/TypeGen.py | 4 ++-- clang/utils/analyzer/CmpRuns.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/utils/ABITest/TypeGen.py b/clang/utils/ABITest/TypeGen.py index 608089429ac84..698e358829f92 100644 --- a/clang/utils/ABITest/TypeGen.py +++ b/clang/utils/ABITest/TypeGen.py @@ -1,5 +1,5 @@ """Flexible enumeration of C types.""" -from __future__ import print_function +from __future__ import division, print_function from Enumeration import * @@ -235,7 +235,7 @@ def fact(n): # Compute the number of combinations (n choose k) def num_combinations(n, k): - return fact(n) / (fact(k) * fact(n - k)) + return fact(n) // (fact(k) * fact(n - k)) # Enumerate the combinations choosing k elements from the list of values def combinations(values, k): diff --git a/clang/utils/analyzer/CmpRuns.py b/clang/utils/analyzer/CmpRuns.py index 14be963296a74..87d5eda7a1806 100755 --- a/clang/utils/analyzer/CmpRuns.py +++ b/clang/utils/analyzer/CmpRuns.py @@ -25,7 +25,7 @@ diff = compareResults(resultsA, resultsB) """ -from __future__ import print_function +from __future__ import division, print_function from collections import defaultdict @@ -308,7 +308,7 @@ def deriveStats(results): "mean": sum(values) / len(values), "90th %tile": computePercentile(values, 0.9), "95th %tile": computePercentile(values, 0.95), - "median": sorted(values)[len(values) / 2], + "median": sorted(values)[len(values) // 2], "total": sum(values) } return combined_stats