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

vecgeom: add development version of surface branch (#49313)

Browse Source 
* vecgeom: add development version of surface branch

* Use tag on main branch

* Get full repo for versioning on master branch
This commit is contained in:
Seth R. Johnson 2025-03-06 05:32:33 -05:00 committed by GitHub
parent 18487a45ed
commit a91f96292c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/vecgeom/package.py
View File

@ -19,11 +19,17 @@ class Vecgeom(CMakePackage, CudaPackage):
maintainers("drbenmorgan", "sethrj") maintainers("drbenmorgan", "sethrj")
version("master", branch="master") version("master", branch="master", get_full_repo=True)
version(
"2.0.0-surfacedev.1",
tag="v2.0.0-surfacedev.1",
commit="1d9797ea47e3b35ab0114e72ce5925ecbd59cbf4",
)
version( version(
"1.2.10", "1.2.10",
url="https://gitlab.cern.ch/-/project/981/uploads/8e0a94013efdd1b2d4f44c3fbb10bcdf/VecGeom-v1.2.10.tar.gz", url="https://gitlab.cern.ch/-/project/981/uploads/8e0a94013efdd1b2d4f44c3fbb10bcdf/VecGeom-v1.2.10.tar.gz",
sha256="3e0934842694452e4cb4a265428cb99af1ecc45f0e2d28a32dfeaa0634c21e2a", sha256="3e0934842694452e4cb4a265428cb99af1ecc45f0e2d28a32dfeaa0634c21e2a",
preferred=True,
) )
version( version(
"1.2.9", "1.2.9",
@ -88,6 +94,7 @@ class Vecgeom(CMakePackage, CudaPackage):
variant("geant4", default=False, description="Support Geant4 geometry construction") variant("geant4", default=False, description="Support Geant4 geometry construction")
variant("root", default=False, description="Support ROOT geometry construction") variant("root", default=False, description="Support ROOT geometry construction")
variant("shared", default=True, description="Build shared libraries") variant("shared", default=True, description="Build shared libraries")
variant("surface", default=False, when="@2:", description="Use surface frame representation")
depends_on("veccore") depends_on("veccore")
depends_on("veccore@0.8.1:", when="+cuda") depends_on("veccore@0.8.1:", when="+cuda")
@ -97,6 +104,9 @@ class Vecgeom(CMakePackage, CudaPackage):
conflicts("+cuda", when="@:1.1.5") conflicts("+cuda", when="@:1.1.5")
# NOTE: surface branch doesn't yet compile with volume
conflicts("~surface", when="@=2.0.0-surfacedev.1")
# Fix empty -Xcompiler= with nvcc # Fix empty -Xcompiler= with nvcc
patch( patch(
"https://gitlab.cern.ch/VecGeom/VecGeom/-/commit/0bf9b675ab70eb5cb9409ff73c1152fd1326dbf4.diff", "https://gitlab.cern.ch/VecGeom/VecGeom/-/commit/0bf9b675ab70eb5cb9409ff73c1152fd1326dbf4.diff",
@ -159,6 +169,8 @@ def cmake_args(self):
raise InstallError("Exactly one cuda_arch must be specified") raise InstallError("Exactly one cuda_arch must be specified")
args.append(define("CUDA_ARCH", arch[0])) args.append(define("CUDA_ARCH", arch[0]))
args.append(from_variant("VECGEOM_USE_SURF", "surface"))
# Set testing flags # Set testing flags
build_tests = self.run_tests build_tests = self.run_tests
args.append(define("BUILD_TESTING", build_tests)) args.append(define("BUILD_TESTING", build_tests))