Use set_dependpent_cmake_args to configure FindMPI

Author: kwryankrattiger

repos/spack_repo/builtin/packages/adiak/package.py

@@ -39,8 +39,6 @@ class Adiak(CMakePackage):
     def cmake_args(self):
         args = []
         if self.spec.satisfies("+mpi"):
-            args.append(f"-DMPI_CXX_COMPILER={self.spec['mpi'].mpicxx}")
-            args.append(f"-DMPI_C_COMPILER={self.spec['mpi'].mpicc}")
             args.append("-DENABLE_MPI=ON")
         else:
             args.append("-DENABLE_MPI=OFF")

repos/spack_repo/builtin/packages/amr_wind/package.py

@@ -152,8 +152,6 @@ def cmake_args(self):
 
         if spec.satisfies("+mpi"):
             args.append(define("MPI_HOME", spec["mpi"].prefix))
-            args.append(define("MPI_CXX_COMPILER", spec["mpi"].mpicxx))
-            args.append(define("MPI_C_COMPILER", spec["mpi"].mpicc))
 
         if spec.satisfies("+hdf5"):
             args.append(define("AMR_WIND_ENABLE_HDF5", True))

repos/spack_repo/builtin/packages/amrex/package.py

@@ -440,9 +440,6 @@ def test_run_install_test(self):
 
         args = ["-S{0}".format(join_path(".", "cache", "amrex", "Tests", "SpackSmokeTest"))]
         args.append("-DAMReX_ROOT=" + self.prefix)
-        if self.spec.satisfies("+mpi"):
-            args.append("-DMPI_C_COMPILER=" + self.spec["mpi"].mpicc)
-            args.append("-DMPI_CXX_COMPILER=" + self.spec["mpi"].mpicxx)
 
         if self.spec.satisfies("+cuda"):
             args.append("-DCMAKE_CUDA_COMPILER=" + join_path(self.spec["cuda"].prefix.bin, "nvcc"))

repos/spack_repo/builtin/packages/ascent/package.py

@@ -57,6 +57,10 @@ class Ascent(CMakePackage, CudaPackage, ROCmPackage):
     url = "https://github.com/Alpine-DAV/ascent/releases/download/v0.5.1/ascent-v0.5.1-src-with-blt.tar.gz"
     tags = ["radiuss", "e4s"]
 
+    # Don't use the automatic hints in favor of building the hostconfig
+    find_mpi_hints = False
+    find_python_hints = False
+
     maintainers("cyrush")
 
     license("BSD-3-Clause")

repos/spack_repo/builtin/packages/axl/package.py

@@ -82,8 +82,6 @@ def cmake_args(self):
         args.append(self.define("WITH_KVTREE_PREFIX", spec["kvtree"].prefix))
 
         args.append(self.define_from_variant("MPI"))
-        if spec.satisfies("+mpi"):
-            args.append(self.define("MPI_C_COMPILER", spec["mpi"].mpicc))
 
         if spec.satisfies("@:0.3.0"):
             apis = list(spec.variants["async_api"].value)

repos/spack_repo/builtin/packages/cardioid/package.py

@@ -43,8 +43,6 @@ def cmake_args(self):
             "-DENABLE_OPENMP:BOOL=ON",
             "-DENABLE_MPI:BOOL=ON",
             "-DENABLE_FIND_MPI:BOOL=OFF",
-            "-DMPI_C_COMPILER:STRING=" + spec["mpi"].mpicc,
-            "-DMPI_CXX_COMPILER:STRING=" + spec["mpi"].mpicxx,
             "-DCMAKE_C_COMPILER:STRING=" + spec["mpi"].mpicc,
             "-DCMAKE_CXX_COMPILER:STRING=" + spec["mpi"].mpicxx,
         ]

repos/spack_repo/builtin/packages/chameleon/package.py

@@ -107,15 +107,6 @@ def cmake_args(self):
                 ]
             )
 
-        if spec.satisfies("+mpi ~simgrid"):
-            args.extend(
-                [
-                    self.define("MPI_C_COMPILER", self.spec["mpi"].mpicc),
-                    self.define("MPI_CXX_COMPILER", self.spec["mpi"].mpicxx),
-                    self.define("MPI_Fortran_COMPILER", self.spec["mpi"].mpifc),
-                ]
-            )
-
         if spec.satisfies("^[virtuals=blas,lapack] intel-oneapi-mkl threads=none"):
             args.extend([self.define("BLA_VENDOR", "Intel10_64lp_seq")])
         elif spec.satisfies("^[virtuals=blas,lapack] intel-oneapi-mkl"):

repos/spack_repo/builtin/packages/conduit/package.py

@@ -39,6 +39,10 @@ class Conduit(CMakePackage):
 
     license("BSD-3-Clause")
 
+    # Don't use the automatic MPI hints in favor of building the hostconfig
+    find_mpi_hints = False
+    find_python_hints = False
+
     version("develop", branch="develop", submodules=True)
     # note: the main branch in conduit was renamed to develop, this next entry
     # is to bridge any spack dependencies that are still using the name master

repos/spack_repo/builtin/packages/dealii/package.py

@@ -537,13 +537,6 @@ def cmake_args(self):
         # MPI
         options.append(self.define_from_variant("DEAL_II_WITH_MPI", "mpi"))
         if spec.satisfies("+mpi"):
-            options.extend(
-                [
-                    self.define("MPI_C_COMPILER", spec["mpi"].mpicc),
-                    self.define("MPI_CXX_COMPILER", spec["mpi"].mpicxx),
-                    self.define("MPI_Fortran_COMPILER", spec["mpi"].mpifc),
-                ]
-            )
             # FIXME: Fix issues with undefined references in MPI. e.g,
             # libmpi.so: undefined reference to `opal_memchecker_base_isaddressable'
             if spec.satisfies("^openmpi"):

repos/spack_repo/builtin/packages/er/package.py

@@ -60,7 +60,6 @@ class Er(CMakePackage):
     def cmake_args(self):
         spec = self.spec
         args = []
-        args.append(self.define("MPI_C_COMPILER", spec["mpi"].mpicc))
         args.append(self.define("WITH_KVTREE_PREFIX", spec["kvtree"].prefix))
         args.append(self.define("WITH_REDSET_PREFIX", spec["redset"].prefix))
         args.append(self.define("WITH_SHUFFILE_PREFIX", spec["shuffile"].prefix))