From aca469b3295debc9b6d2e0753c937774a2d59dcb Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 24 Dec 2024 14:29:53 +0100 Subject: [PATCH] mpi: remove setting unused monkey patched variable (#48275) mpicxx_shared_libraries seems a relic of #1550, and is not currently used by any builtin package. Thus, cleanup the recipes, and avoid monkey-patching spec objects. --- var/spack/repos/builtin/packages/cray-mvapich2/package.py | 5 ----- var/spack/repos/builtin/packages/mpich/package.py | 6 ------ var/spack/repos/builtin/packages/mvapich/package.py | 5 ----- var/spack/repos/builtin/packages/mvapich2-gdr/package.py | 5 ----- var/spack/repos/builtin/packages/mvapich2/package.py | 4 ---- var/spack/repos/builtin/packages/mvapich2x/package.py | 5 ----- var/spack/repos/builtin/packages/openmpi/package.py | 4 ---- var/spack/repos/tutorial/packages/mpich/package.py | 5 ----- 8 files changed, 39 deletions(-) diff --git a/var/spack/repos/builtin/packages/cray-mvapich2/package.py b/var/spack/repos/builtin/packages/cray-mvapich2/package.py index 03ad2d05160..6cf9b37615b 100644 --- a/var/spack/repos/builtin/packages/cray-mvapich2/package.py +++ b/var/spack/repos/builtin/packages/cray-mvapich2/package.py @@ -53,11 +53,6 @@ def setup_dependent_package(self, module, dependent_spec): spec.mpifc = dependent_module.spack_fc spec.mpif77 = dependent_module.spack_f77 - spec.mpicxx_shared_libs = [ - join_path(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] - def install(self, spec, prefix): raise InstallError( self.spec.format( diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 4683e2e6a64..be6caf0050e 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -8,7 +8,6 @@ import sys import spack.compilers -from spack.build_environment import dso_suffix from spack.package import * @@ -482,11 +481,6 @@ def setup_dependent_package(self, module, dependent_spec): spec.mpifc = join_path(self.prefix.bin, "mpif90") spec.mpif77 = join_path(self.prefix.bin, "mpif77") - spec.mpicxx_shared_libs = [ - join_path(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] - def autoreconf(self, spec, prefix): """Not needed usually, configure should be already there""" # If configure exists nothing needs to be done diff --git a/var/spack/repos/builtin/packages/mvapich/package.py b/var/spack/repos/builtin/packages/mvapich/package.py index 55aa19f3e2b..88d33c626f1 100644 --- a/var/spack/repos/builtin/packages/mvapich/package.py +++ b/var/spack/repos/builtin/packages/mvapich/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import itertools -import os.path import re import sys @@ -242,10 +241,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx") self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") - self.spec.mpicxx_shared_libs = [ - os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] @run_before("configure") def die_without_fortran(self): diff --git a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py index ae9ad23d02f..6221e548dac 100755 --- a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py +++ b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import os.path import sys from spack.package import * @@ -184,10 +183,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx") self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") - self.spec.mpicxx_shared_libs = [ - os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index c0ff3bb07fa..63aad00a522 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -399,10 +399,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx") self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") - self.spec.mpicxx_shared_libs = [ - os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] @run_before("configure") def die_without_fortran(self): diff --git a/var/spack/repos/builtin/packages/mvapich2x/package.py b/var/spack/repos/builtin/packages/mvapich2x/package.py index 5962ef69683..660a2e5e057 100644 --- a/var/spack/repos/builtin/packages/mvapich2x/package.py +++ b/var/spack/repos/builtin/packages/mvapich2x/package.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import os.path import sys from spack.package import * @@ -239,10 +238,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx") self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") - self.spec.mpicxx_shared_libs = [ - os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index bd4288e65e0..1bbd3bf13ea 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -931,10 +931,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpicxx = join_path(self.prefix.bin, "mpic++") self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") - self.spec.mpicxx_shared_libs = [ - join_path(self.prefix.lib, "libmpi_cxx.{0}".format(dso_suffix)), - join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] # Most of the following with_or_without methods might seem redundant # because Spack compiler wrapper adds the required -I and -L flags, which diff --git a/var/spack/repos/tutorial/packages/mpich/package.py b/var/spack/repos/tutorial/packages/mpich/package.py index c625ecbc175..e93745937e9 100644 --- a/var/spack/repos/tutorial/packages/mpich/package.py +++ b/var/spack/repos/tutorial/packages/mpich/package.py @@ -93,11 +93,6 @@ def setup_dependent_package(self, module, dependent_spec): self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") - self.spec.mpicxx_shared_libs = [ - join_path(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)), - join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)), - ] - def autoreconf(self, spec, prefix): """Not needed usually, configure should be already there""" # If configure exists nothing needs to be done