hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed use of mpi wrappers for fms and mapl package.py scripts. These were causing (#43726)

Browse source 
builds to fail on MacOS and CMake appears to handle the build fine without the mpi wrappers.
This commit is contained in:
Stephen Herbener 2024-05-01 16:41:30 -06:00 committed by GitHub
parent 7896ff51f6
commit d21aa1cc12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/fms/package.py
View file

@ -112,8 +112,4 @@ def cmake_args(self):
self.define_from_variant("USE_DEPRECATED_IO", "deprecated_io"), self.define_from_variant("USE_DEPRECATED_IO", "deprecated_io"),
] ]
args.append(self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc))
args.append(self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx))
args.append(self.define("CMAKE_Fortran_COMPILER", self.spec["mpi"].mpifc))
return args return args

6
var/spack/repos/builtin/packages/mapl/package.py
View file

@ -246,6 +246,9 @@ class Mapl(CMakePackage):
depends_on("py-numpy", when="+f2py") depends_on("py-numpy", when="+f2py")
depends_on("perl") depends_on("perl")
# when using apple-clang version 15.x or newer, need to use the llvm-openmp library
depends_on("llvm-openmp", when="%apple-clang@15:", type=("build", "run"))
def cmake_args(self): def cmake_args(self):
args = [ args = [
self.define_from_variant("BUILD_WITH_FLAP", "flap"), self.define_from_variant("BUILD_WITH_FLAP", "flap"),
@ -254,9 +257,6 @@ def cmake_args(self):
self.define_from_variant("BUILD_SHARED_MAPL", "shared"), self.define_from_variant("BUILD_SHARED_MAPL", "shared"),
self.define_from_variant("USE_EXTDATA2G", "extdata2g"), self.define_from_variant("USE_EXTDATA2G", "extdata2g"),
self.define_from_variant("USE_F2PY", "f2py"), self.define_from_variant("USE_F2PY", "f2py"),
"-DCMAKE_C_COMPILER=%s" % self.spec["mpi"].mpicc,
"-DCMAKE_CXX_COMPILER=%s" % self.spec["mpi"].mpicxx,
"-DCMAKE_Fortran_COMPILER=%s" % self.spec["mpi"].mpifc,
] ]
if self.spec.satisfies("@2.22.0:"): if self.spec.satisfies("@2.22.0:"):