diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index 4f6e0e1e31..a6f9c05563 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -13,19 +13,54 @@ class Apex(CMakePackage): maintainers("khuck") homepage = "https://uo-oaciss.github.io/apex" - url = "https://github.com/UO-OACISS/apex/archive/v2.3.1.tar.gz" + url = "https://github.com/UO-OACISS/apex/archive/v2.6.2.tar.gz" git = "https://github.com/UO-OACISS/apex" version("develop", branch="develop") version("master", branch="master") - version("2.5.1", sha256="c01016e6a8a3a77e1021281ae53681cb83ea7a369c346ef85d45d27bacca2fca") - version("2.5.0", sha256="d4a95f6226985acf2143e2b779b7bba3caf823564b04826b022f1a0c31093a0f") - version("2.4.1", sha256="055d09dd36c529ebd3bab4defbec4ad1d227c004a291faf26e77e4ab79ce470c") - version("2.4.0", sha256="15d8957da7b37d2c684a6f0f32aef65b0b26be6558da17963cf71f3fd3cfdf2f") - version("2.3.2", sha256="acf37c024a2283cafbf206f508929208b62c8f800af22ad7c74c570863a31bb4") - version("2.3.1", sha256="86bf6933f2c53531fcb24cda9fc7dc9919909bed54740d1e0bc3e7ce6ed78091") - version("2.3.0", sha256="7e1d16c9651b913c5e28abdbad75f25c55ba25e9fa35f5d979c1d3f9b9852c58") - version("2.2.0", sha256="cd5eddb1f6d26b7dbb4a8afeca2aa28036c7d0987e0af0400f4f96733889c75c") + version("2.6.2", sha256="0c3ec26631db7925f50cf4e8920a778b57d11913f239a0eb964081f925129725") + version("2.6.1", sha256="511dbab0af541489052a3d6379c48f9577e51654491d3b2c8545020e9d29fb29") + version("2.6.0", sha256="25b4f6afd1083475dc6680b5da87759c62d31fcf368996185573694fc40d5317") + version( + "2.5.1", + sha256="c01016e6a8a3a77e1021281ae53681cb83ea7a369c346ef85d45d27bacca2fca", + deprecated=True, + ) + version( + "2.5.0", + sha256="d4a95f6226985acf2143e2b779b7bba3caf823564b04826b022f1a0c31093a0f", + deprecated=True, + ) + version( + "2.4.1", + sha256="055d09dd36c529ebd3bab4defbec4ad1d227c004a291faf26e77e4ab79ce470c", + deprecated=True, + ) + version( + "2.4.0", + sha256="15d8957da7b37d2c684a6f0f32aef65b0b26be6558da17963cf71f3fd3cfdf2f", + deprecated=True, + ) + version( + "2.3.2", + sha256="acf37c024a2283cafbf206f508929208b62c8f800af22ad7c74c570863a31bb4", + deprecated=True, + ) + version( + "2.3.1", + sha256="86bf6933f2c53531fcb24cda9fc7dc9919909bed54740d1e0bc3e7ce6ed78091", + deprecated=True, + ) + version( + "2.3.0", + sha256="7e1d16c9651b913c5e28abdbad75f25c55ba25e9fa35f5d979c1d3f9b9852c58", + deprecated=True, + ) + version( + "2.2.0", + sha256="cd5eddb1f6d26b7dbb4a8afeca2aa28036c7d0987e0af0400f4f96733889c75c", + deprecated=True, + ) # Disable some default dependencies on Darwin/OSX darwin_default = False @@ -35,7 +70,7 @@ class Apex(CMakePackage): # Enable by default variant("activeharmony", default=True, description="Enables Active Harmony support") variant("plugins", default=True, description="Enables Policy Plugin support") - variant("binutils", default=True, description="Enables Binutils support") + variant("binutils", default=darwin_default, description="Enables Binutils support") variant("otf2", default=True, description="Enables OTF2 support") variant( "gperftools", @@ -48,6 +83,7 @@ class Apex(CMakePackage): # Disable by default variant("cuda", default=False, description="Enables CUDA support") variant("hip", default=False, description="Enables ROCm/HIP support") + variant("sycl", default=False, description="Enables Intel SYCL support (Level0)") variant("boost", default=False, description="Enables Boost support") variant("jemalloc", default=False, description="Enables JEMalloc support") variant("lmsensors", default=False, description="Enables LM-Sensors support") @@ -70,6 +106,7 @@ class Apex(CMakePackage): depends_on("papi@5.7.0:", when="+papi") depends_on("cuda", when="+cuda") depends_on("hip", when="+hip") + depends_on("sycl", when="+sycl") depends_on("roctracer-dev", when="+hip") depends_on("rocm-smi-lib", when="+hip") depends_on("boost@1.54: +exception+chrono+system+atomic+container+regex+thread", when="+boost") @@ -98,6 +135,7 @@ def cmake_args(self): args.append(self.define_from_variant(prefix + "_BFD", "binutils")) args.append(self.define_from_variant("APEX_WITH_CUDA", "cuda")) args.append(self.define_from_variant("APEX_WITH_HIP", "hip")) + args.append(self.define_from_variant("APEX_WITH_LEVEL0", "sycl")) args.append(self.define_from_variant(prefix + "_MPI", "mpi")) args.append(self.define_from_variant(prefix + "_OMPT", "openmp")) args.append(self.define_from_variant(prefix + "_OTF2", "otf2"))