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

celeritas: add develop version

Browse Source
This commit is contained in:
Seth R Johnson 2025-02-11 17:34:23 -05:00
parent eeeb043f37
commit 61a3043fe0
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/celeritas/package.py
View File

@ -4,6 +4,7 @@
from spack.build_systems.cmake import CMakeBuilder from spack.build_systems.cmake import CMakeBuilder
from spack.package import * from spack.package import *
from spack.version import GitVersion
class Celeritas(CMakePackage, CudaPackage, ROCmPackage): class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
@ -13,12 +14,16 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
""" """
homepage = "https://github.com/celeritas-project/celeritas" homepage = "https://github.com/celeritas-project/celeritas"
git = "https://github.com/celeritas-project/celeritas.git"
url = "https://github.com/celeritas-project/celeritas/releases/download/v0.1.0/celeritas-0.1.0.tar.gz" url = "https://github.com/celeritas-project/celeritas/releases/download/v0.1.0/celeritas-0.1.0.tar.gz"
maintainers("sethrj") maintainers("sethrj")
license("Apache-2.0") license("Apache-2.0")
version("develop", branch="develop")
next_develop_version = "0.6.0"
version("0.5.1", sha256="182d5466fbd98ba9400b343b55f6a06e03b77daed4de1dd16f632ac0a3620249") version("0.5.1", sha256="182d5466fbd98ba9400b343b55f6a06e03b77daed4de1dd16f632ac0a3620249")
version("0.5.0", sha256="4a8834224d96fd01897e5872ac109f60d91ef0bd7b63fac05a73dcdb61a5530e") version("0.5.0", sha256="4a8834224d96fd01897e5872ac109f60d91ef0bd7b63fac05a73dcdb61a5530e")
version("0.4.4", sha256="8b5ae63aa2d50c2ecf48d752424e4a33c50c07d9f0f5ca5448246de3286fd836") version("0.4.4", sha256="8b5ae63aa2d50c2ecf48d752424e4a33c50c07d9f0f5ca5448246de3286fd836")
@ -72,6 +77,7 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
depends_on("nlohmann-json") depends_on("nlohmann-json")
depends_on("geant4@10.5:", when="@0.4.2: +geant4") depends_on("geant4@10.5:", when="@0.4.2: +geant4")
depends_on("geant4@10.5:11.1", when="@0.3.1:0.4.1 +geant4") depends_on("geant4@10.5:11.1", when="@0.3.1:0.4.1 +geant4")
depends_on("g4vg@develop", when="@develop +geant4 +vecgeom")
depends_on("hepmc3", when="+hepmc3") depends_on("hepmc3", when="+hepmc3")
depends_on("root", when="+root") depends_on("root", when="+root")
depends_on("swig@4.1:", when="+swig") depends_on("swig@4.1:", when="+swig")
@ -149,4 +155,15 @@ def cmake_args(self):
# JSON is required for 0.5 and later # JSON is required for 0.5 and later
args.append(define("CELERITAS_USE_JSON", True)) args.append(define("CELERITAS_USE_JSON", True))
if self.version >= Version("0.6"):
args.extend((
define(f"CELERITAS_BUILTIN_{pkg}", False)
for pkg in ["GTest", "nlohmann_json", "G4VG"]))
if self.version == Version("develop"):
args.append(define("Celeritas_GIT_DESCRIBE",
[self.next_develop_version,
"-dev",
"spack"]))
return args return args

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

@ -3,6 +3,7 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack.package import * from spack.package import *
from spack.version import GitVersion
class G4vg(CMakePackage): class G4vg(CMakePackage):
@ -17,6 +18,8 @@ class G4vg(CMakePackage):
license("Apache-2.0", checked_by="sethrj") license("Apache-2.0", checked_by="sethrj")
version("develop", branch="main") version("develop", branch="main")
next_develop_version = "1.1.0"
version("1.0.1", sha256="add7ce4bc37889cac2101323a997cea8574b18da6cbeffdab44a2b714d134e99") version("1.0.1", sha256="add7ce4bc37889cac2101323a997cea8574b18da6cbeffdab44a2b714d134e99")
variant("debug", default=False, description="Enable runtime debug assertions") variant("debug", default=False, description="Enable runtime debug assertions")
@ -35,4 +38,10 @@ def cmake_args(self):
define("G4VG_BUILD_TESTS", False), define("G4VG_BUILD_TESTS", False),
] ]
if self.version == Version("develop"):
args.append(define("G4VG_GIT_DESCRIBE",
[self.next_develop_version,
"-dev",
"spack"]))
return args return args