Fix MPI selection in SAMRAI and remove narrow dependency specification
This commit is contained in:
		@@ -33,13 +33,10 @@ class Samrai(Package):
 | 
			
		||||
 | 
			
		||||
    # TODO: currently hard-coded to use openmpi - be careful!
 | 
			
		||||
    def install(self, spec, prefix):
 | 
			
		||||
        mpi = next(m for m in ('openmpi', 'mpich', 'mvapich')
 | 
			
		||||
                   if m in spec)
 | 
			
		||||
 | 
			
		||||
        configure(
 | 
			
		||||
            "--prefix=%s" % prefix,
 | 
			
		||||
            "--with-CXX=%s" % spec[mpi].prefix.bin + "/mpic++",
 | 
			
		||||
            "--with-CC=%s" % spec[mpi].prefix.bin + "/mpicc",
 | 
			
		||||
            "--with-CXX=%s" % spec['mpi'].prefix.bin + "/mpic++",
 | 
			
		||||
            "--with-CC=%s" % spec['mpi'].prefix.bin + "/mpicc",
 | 
			
		||||
            "--with-hdf5=%s" % spec['hdf5'].prefix,
 | 
			
		||||
            "--with-boost=%s" % spec['boost'].prefix,
 | 
			
		||||
            "--with-zlib=%s" % spec['zlib'].prefix,
 | 
			
		||||
 
 | 
			
		||||
@@ -13,7 +13,7 @@ class Cleverleaf(Package):
 | 
			
		||||
 | 
			
		||||
    version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop')
 | 
			
		||||
 | 
			
		||||
    depends_on("SAMRAI@3.8.0")
 | 
			
		||||
    depends_on("SAMRAI@3.8.0:")
 | 
			
		||||
    depends_on("hdf5")
 | 
			
		||||
    depends_on("boost")
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user