From 477ce206c2c02ec44be191963e631cc63126259f Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 8 Jan 2019 11:09:06 +0100 Subject: [PATCH] Inlined llnl.util.multiproc.execute (abstraction was not very useful) --- lib/spack/llnl/util/multiproc.py | 20 -------------------- lib/spack/spack/compilers/__init__.py | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/spack/llnl/util/multiproc.py b/lib/spack/llnl/util/multiproc.py index 04f1373aaf0..0226eae7610 100644 --- a/lib/spack/llnl/util/multiproc.py +++ b/lib/spack/llnl/util/multiproc.py @@ -32,26 +32,6 @@ def _deferred_call(): return _impl -def invoke(f): - return f() - - -def execute(command_list, map_fn=map, transformation=invoke): - """Execute a list of packaged commands and return their result. - - Args: - command_list: list of commands to be executed - map_fn: object that execute each command. Must have the - same semantic as ``map`` - transformation: callable invoked on each item to construct - the output list - - Returns: - List of results - """ - return map_fn(transformation, command_list) - - class Barrier: """Simple reusable semaphore barrier. diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index e2884f616f1..58ff1e9acf8 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -9,7 +9,6 @@ import multiprocessing.pool import os -import llnl.util.multiproc from llnl.util.lang import list_modules import spack.paths @@ -196,7 +195,7 @@ def find_compilers(*paths): tags.extend(t), commands.extend(c) tp = multiprocessing.pool.ThreadPool() - compiler_versions = llnl.util.multiproc.execute(commands, tp.map) + compiler_versions = tp.map(lambda x: x(), commands) tp.close() return spack.compiler.make_compiler_list(tags, compiler_versions)