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

legion: Add 23.09.0 and 23.12.0, remove control_replication. (#42915)

Browse Source 
* legion: Add 23.09.0 and 23.12.0, remove control_replication.

The branch control_replication has been merged to master and should no
longer be used.

* flecsi: Switch to Legion master branch.

Legion control_replication has been merged to master.

* Fix Legion 23.09.0 and 23.12.0 build for ROCm 6.
This commit is contained in:
Elliott Slaughter 2024-03-02 10:32:44 -08:00 committed by GitHub
parent e68a17f2c6
commit ea5db048f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
depends_on("legion+shared", when="backend=legion @:1")
depends_on("legion+hdf5", when="backend=legion +hdf5 @:1")
depends_on("legion build_type=Debug", when="backend=legion +debug_backend")
depends_on("legion@cr", when="backend=legion @:1")
depends_on("legion@master", when="backend=legion @:1")
depends_on("hpx@1.4.1 cxxstd=17 malloc=system max_cpu_count=128", when="backend=hpx @:1")
depends_on("hpx build_type=Debug", when="backend=hpx +debug_backend")
depends_on("googletest@1.8.1+gmock", when="@:1")
@ -113,7 +113,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
depends_on("kokkos +cuda +cuda_constexpr +cuda_lambda", when="+kokkos +cuda @2.0:")
depends_on("kokkos +rocm", when="+kokkos +rocm @2.0:")
depends_on("kokkos +openmp", when="+kokkos +openmp @2.0:")
depends_on("legion@cr", when="backend=legion @2.0:")
depends_on("legion@master", when="backend=legion @2.0:")
depends_on("legion+shared", when="backend=legion +shared @2.0:")
depends_on("legion+hdf5", when="backend=legion +hdf5 @2.0:")
depends_on("legion+kokkos", when="backend=legion +kokkos @2.0:")

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

@ -27,6 +27,8 @@ class Legion(CMakePackage, ROCmPackage):
maintainers("pmccormick", "streichler", "elliottslaughter")
tags = ["e4s"]
version("23.12.0", tag="legion-23.12.0", commit="8fea67ee694a5d9fb27232a7976af189d6c98456")
version("23.09.0", tag="legion-23.09.0", commit="7304dfcf9b69005dd3e65e9ef7d5bd49122f9b49")
version("23.06.0", tag="legion-23.06.0", commit="7b5ff2fb9974511c28aec8d97b942f26105b5f6d")
version("23.03.0", tag="legion-23.03.0", commit="12f6051c9d75229d00ac0b31d6be1ff2014f7e6a")
version("22.12.0", tag="legion-22.12.0", commit="9ed6f4d6b579c4f17e0298462e89548a4f0ed6e5")
@ -39,7 +41,6 @@ class Legion(CMakePackage, ROCmPackage):
version("21.03.0", tag="legion-21.03.0", commit="0cf9ddd60c227c219c8973ed0580ddc5887c9fb2")
version("stable", branch="stable")
version("master", branch="master")
version("cr", branch="control_replication")
depends_on("cmake@3.16:", type="build")
# TODO: Need to spec version of MPI v3 for use of the low-level MPI transport
@ -74,7 +75,7 @@ class Legion(CMakePackage, ROCmPackage):
# https://github.com/spack/spack/issues/37232#issuecomment-1553376552
patch("hip-offload-arch.patch", when="@23.03.0 +rocm")
patch("update-hip-path-legion-23.06.0.patch", when="@23.06.0 ^hip@6.0 +rocm")
patch("update-hip-path-legion-23.06.0.patch", when="@23.06.0:23.12.0 ^hip@6.0 +rocm")
def patch(self):
if "network=gasnet conduit=ofi-slingshot11 ^cray-mpich+wrappers" in self.spec: