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

chameleon: correct chameleon+simgrid build (#33559)

Browse Source 
* chameleon: correct chameleon+simgrid build
* chameleon: remove unused declarations
This commit is contained in:
Lucas Nesi 2022-10-27 17:59:06 +02:00 committed by GitHub
parent 2960d8ac0a
commit 86337f042e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/chameleon/package.py
View File

@ -54,8 +54,11 @@ class Chameleon(CMakePackage, CudaPackage):
depends_on("starpu~cuda", when="~cuda") depends_on("starpu~cuda", when="~cuda")
depends_on("starpu+cuda", when="+cuda") depends_on("starpu+cuda", when="+cuda")
with when("+simgrid"): with when("+simgrid"):
depends_on("simgrid+msg")
depends_on("starpu+simgrid") depends_on("starpu+simgrid")
depends_on("starpu+mpi~shared+simgrid", when="+mpi") depends_on("starpu+mpi~shared+simgrid", when="+mpi")
conflicts("^simgrid@:3.31", when="@:1.1.0")
conflicts("+shared", when="+simgrid")
with when("~simgrid"): with when("~simgrid"):
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
depends_on("cuda", when="+cuda") depends_on("cuda", when="+cuda")
@ -90,9 +93,9 @@ def cmake_args(self):
if spec.satisfies("+mpi +simgrid"): if spec.satisfies("+mpi +simgrid"):
args.extend( args.extend(
[ [
self.define("MPI_C_COMPILER", self.spec["simgrid"].smpicc), self.define("CMAKE_C_COMPILER", self.spec["simgrid"].smpicc),
self.define("MPI_CXX_COMPILER", self.spec["simgrid"].smpicxx), self.define("CMAKE_CXX_COMPILER", self.spec["simgrid"].smpicxx),
self.define("MPI_Fortran_COMPILER", self.spec["simgrid"].smpifc), self.define("CMAKE_Fortran_COMPILER", self.spec["simgrid"].smpifc),
] ]
) )