zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpi: remove setting unused monkey patched variable (#48275)

Browse Source 
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.
This commit is contained in:
Massimiliano Culpo 2024-12-24 14:29:53 +01:00 committed by GitHub
parent c65a0e03c4
commit aca469b329
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/cray-mvapich2/package.py
View File

@ -53,11 +53,6 @@ def setup_dependent_package(self, module, dependent_spec):
spec.mpifc = dependent_module.spack_fc spec.mpifc = dependent_module.spack_fc
spec.mpif77 = dependent_module.spack_f77 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): def install(self, spec, prefix):
raise InstallError( raise InstallError(
self.spec.format( self.spec.format(

6
var/spack/repos/builtin/packages/mpich/package.py
View File

@ -8,7 +8,6 @@
import sys import sys
import spack.compilers import spack.compilers
from spack.build_environment import dso_suffix
from spack.package import * 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.mpifc = join_path(self.prefix.bin, "mpif90")
spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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): def autoreconf(self, spec, prefix):
"""Not needed usually, configure should be already there""" """Not needed usually, configure should be already there"""
# If configure exists nothing needs to be done # If configure exists nothing needs to be done

5
var/spack/repos/builtin/packages/mvapich/package.py
View File

@ -4,7 +4,6 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import itertools import itertools
import os.path
import re import re
import sys 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.mpicxx = join_path(self.prefix.bin, "mpicxx")
self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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") @run_before("configure")
def die_without_fortran(self): def die_without_fortran(self):

5
var/spack/repos/builtin/packages/mvapich2-gdr/package.py
View File

@ -3,7 +3,6 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import os.path
import sys import sys
from spack.package import * 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.mpicxx = join_path(self.prefix.bin, "mpicxx")
self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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): def configure_args(self):
spec = self.spec spec = self.spec

4
var/spack/repos/builtin/packages/mvapich2/package.py
View File

@ -399,10 +399,6 @@ def setup_dependent_package(self, module, dependent_spec):
self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx") self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx")
self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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") @run_before("configure")
def die_without_fortran(self): def die_without_fortran(self):

5
var/spack/repos/builtin/packages/mvapich2x/package.py
View File

@ -3,7 +3,6 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import os.path
import sys import sys
from spack.package import * 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.mpicxx = join_path(self.prefix.bin, "mpicxx")
self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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): def configure_args(self):
spec = self.spec spec = self.spec

4
var/spack/repos/builtin/packages/openmpi/package.py
View File

@ -931,10 +931,6 @@ def setup_dependent_package(self, module, dependent_spec):
self.spec.mpicxx = join_path(self.prefix.bin, "mpic++") self.spec.mpicxx = join_path(self.prefix.bin, "mpic++")
self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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 # Most of the following with_or_without methods might seem redundant
# because Spack compiler wrapper adds the required -I and -L flags, which # because Spack compiler wrapper adds the required -I and -L flags, which

5
var/spack/repos/tutorial/packages/mpich/package.py
View File

@ -93,11 +93,6 @@ def setup_dependent_package(self, module, dependent_spec):
self.spec.mpifc = join_path(self.prefix.bin, "mpif90") self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77") 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): def autoreconf(self, spec, prefix):
"""Not needed usually, configure should be already there""" """Not needed usually, configure should be already there"""
# If configure exists nothing needs to be done # If configure exists nothing needs to be done