From 2b51980904933f8275e9a60f164a0bc6b2eda070 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sat, 27 Jan 2024 16:15:35 +0100 Subject: Apply black 2024 style to Spack (#42317) --- var/spack/repos/builtin/packages/arborx/package.py | 8 ++++--- var/spack/repos/builtin/packages/bricks/package.py | 1 - .../repos/builtin/packages/dla-future/package.py | 8 ++++--- .../repos/builtin/packages/elbencho/package.py | 1 - var/spack/repos/builtin/packages/llvm/package.py | 6 ++--- var/spack/repos/builtin/packages/mpip/package.py | 1 - var/spack/repos/builtin/packages/mumps/package.py | 28 ++++++++++++---------- var/spack/repos/builtin/packages/npb/package.py | 2 +- .../repos/builtin/packages/openvdb/package.py | 1 - .../repos/builtin/packages/trilinos/package.py | 8 ++++--- 10 files changed, 35 insertions(+), 29 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py index 1414a22d7a..f65b6e92b0 100644 --- a/var/spack/repos/builtin/packages/arborx/package.py +++ b/var/spack/repos/builtin/packages/arborx/package.py @@ -144,9 +144,11 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): f"-DCMAKE_CXX_COMPILER={os.environ['CXX']}", self.define( "Kokkos_ROOT", - self.spec["kokkos"].prefix - if "~trilinos" in self.spec - else self.spec["trilinos"].prefix, + ( + self.spec["kokkos"].prefix + if "~trilinos" in self.spec + else self.spec["trilinos"].prefix + ), ), ] cmake = which(self.spec["cmake"].prefix.bin.cmake) diff --git a/var/spack/repos/builtin/packages/bricks/package.py b/var/spack/repos/builtin/packages/bricks/package.py index af1bfa1c04..037802de68 100644 --- a/var/spack/repos/builtin/packages/bricks/package.py +++ b/var/spack/repos/builtin/packages/bricks/package.py @@ -9,7 +9,6 @@ from spack.package import * class Bricks(CMakePackage): - """Bricks is a data layout and code generation framework, enabling performance-portable stencil computations across a multitude of architectures.""" diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index 29007433df..399e462ebb 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -169,9 +169,11 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): ] elif mkl_provider == "intel-mkl": args += [ - self.define("DLAF_WITH_MKL", True) - if spec.version <= Version("0.3") - else self.define("DLAF_WITH_MKL_LEGACY", True), + ( + self.define("DLAF_WITH_MKL", True) + if spec.version <= Version("0.3") + else self.define("DLAF_WITH_MKL_LEGACY", True) + ), self.define("MKL_LAPACK_TARGET", f"mkl::mkl_intel_32bit_{mkl_threads}_dyn"), ] diff --git a/var/spack/repos/builtin/packages/elbencho/package.py b/var/spack/repos/builtin/packages/elbencho/package.py index bcc0b6fc53..4088b11d28 100644 --- a/var/spack/repos/builtin/packages/elbencho/package.py +++ b/var/spack/repos/builtin/packages/elbencho/package.py @@ -9,7 +9,6 @@ from spack.package import * class Elbencho(MakefilePackage): - """ Elbencho storage benchmark """ diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 266922926b..de03939e6d 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -967,9 +967,9 @@ class Llvm(CMakePackage, CudaPackage): "openmp", ] runtimes.sort( - key=lambda x: runtimes_order.index(x) - if x in runtimes_order - else len(runtimes_order) + key=lambda x: ( + runtimes_order.index(x) if x in runtimes_order else len(runtimes_order) + ) ) cmake_args.extend( [ diff --git a/var/spack/repos/builtin/packages/mpip/package.py b/var/spack/repos/builtin/packages/mpip/package.py index 1655c48360..c7628f07d6 100644 --- a/var/spack/repos/builtin/packages/mpip/package.py +++ b/var/spack/repos/builtin/packages/mpip/package.py @@ -7,7 +7,6 @@ from spack.package import * class Mpip(AutotoolsPackage): - """mpiP: Lightweight, Scalable MPI Profiling""" homepage = "https://software.llnl.gov/mpiP/" diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index df81143a25..c048ce55eb 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -135,16 +135,18 @@ class Mumps(Package): [ "IMETIS = -I%s" % self.spec["parmetis"].prefix.include, ( - "LMETIS = -L%s -l%s -L%s -l%s" - % ( - self.spec["parmetis"].prefix.lib, - "parmetis", - self.spec["metis"].prefix.lib, - "metis", + ( + "LMETIS = -L%s -l%s -L%s -l%s" + % ( + self.spec["parmetis"].prefix.lib, + "parmetis", + self.spec["metis"].prefix.lib, + "metis", + ) ) - ) - if not shared - else "LMETIS =", + if not shared + else "LMETIS =" + ), ] ) @@ -153,9 +155,11 @@ class Mumps(Package): makefile_conf.extend( [ "IMETIS = -I%s" % self.spec["metis"].prefix.include, - ("LMETIS = -L%s -l%s" % (self.spec["metis"].prefix.lib, "metis")) - if not shared - else "LMETIS =", + ( + ("LMETIS = -L%s -l%s" % (self.spec["metis"].prefix.lib, "metis")) + if not shared + else "LMETIS =" + ), ] ) diff --git a/var/spack/repos/builtin/packages/npb/package.py b/var/spack/repos/builtin/packages/npb/package.py index 63275fd3c9..e14f99bbab 100644 --- a/var/spack/repos/builtin/packages/npb/package.py +++ b/var/spack/repos/builtin/packages/npb/package.py @@ -58,7 +58,7 @@ class Npb(MakefilePackage): # ~4X size increase going from one class to the next "D", "E", - "F" # large test problems + "F", # large test problems # ~16X size increase from each of the previous classes ) diff --git a/var/spack/repos/builtin/packages/openvdb/package.py b/var/spack/repos/builtin/packages/openvdb/package.py index 2b8f952ffb..293839704f 100644 --- a/var/spack/repos/builtin/packages/openvdb/package.py +++ b/var/spack/repos/builtin/packages/openvdb/package.py @@ -10,7 +10,6 @@ from spack.package import * class Openvdb(CMakePackage): - """OpenVDB - a sparse volume data format.""" homepage = "https://github.com/AcademySoftwareFoundation/openvdb" diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index b271e4c5ab..da44b38411 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -649,9 +649,11 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): options.append( define( "Trilinos_CXX11_FLAGS", - self.compiler.cxx14_flag - if spec.variants["cxxstd"].value == "14" - else self.compiler.cxx11_flag, + ( + self.compiler.cxx14_flag + if spec.variants["cxxstd"].value == "14" + else self.compiler.cxx11_flag + ), ) ) -- cgit v1.2.3-70-g09d2