From e09ecd02e506cbaf5694de0699b7df1f2e39ef89 Mon Sep 17 00:00:00 2001 From: Serge Guelton Date: Thu, 3 Jan 2019 14:12:30 +0000 Subject: [PATCH] Python compat - map/filter Differential Revision: https://reviews.llvm.org/D56259 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350313 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/opt-viewer/optpmap.py | 2 +- utils/schedcover.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/opt-viewer/optpmap.py b/tools/opt-viewer/optpmap.py index db6b079b3a6..ff3e683f3d0 100644 --- a/tools/opt-viewer/optpmap.py +++ b/tools/opt-viewer/optpmap.py @@ -42,7 +42,7 @@ def pmap(func, iterable, processes, should_print_progress, *args, **kwargs): func_and_args = [(func, arg, should_print_progress,) for arg in iterable] if processes == 1: - result = map(_wrapped_func, func_and_args, *args, **kwargs) + result = list(map(_wrapped_func, func_and_args, *args, **kwargs)) else: pool = multiprocessing.Pool(initializer=_init, initargs=(_current, _total,), diff --git a/utils/schedcover.py b/utils/schedcover.py index 8c0aeeb32b5..9532f1b554b 100644 --- a/utils/schedcover.py +++ b/utils/schedcover.py @@ -39,7 +39,7 @@ def display(): ordered_table = sorted(table.items(), key=operator.itemgetter(0)) ordered_models = ["itinerary", "default"] ordered_models.extend(sorted(models)) - ordered_models = filter(filter_model, ordered_models) + ordered_models = [m for m in ordered_models if filter_model(m)] # print header sys.stdout.write("instruction") -- 2.50.1