From 8d10dce651db074c09748ac36cea62d2cbde7a75 Mon Sep 17 00:00:00 2001 From: Ben Morgan Date: Fri, 2 Dec 2022 22:56:43 +0000 Subject: vecgeom: add new 1.2.1 version (#34240) * vecgeom: add new 1.2.1 version * vecgeom: introduce conflict between gcc/cuda Recent tests of vecgeom in Spack environments have shown that the build with +cuda fails with GCC >= 11.3 and CUDA < 11.7 with error ...lib/gcc/x86_64-pc-linux-gnu/11.3.0/include/serializeintrin.h(41): error: identifier "__builtin_ia32_serialize" is undefined 1 error detected in the compilation of ".../VecGeom/source/BVHManager.cu". Other GCC/CUDA combinations appear o.k. Avoid this error in spack, and document it for users, with a conflict directive to express the restriction. --- var/spack/repos/builtin/packages/vecgeom/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index bdeefe5335..17a721a590 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -20,6 +20,7 @@ class Vecgeom(CMakePackage, CudaPackage): maintainers = ["drbenmorgan", "sethrj"] version("master", branch="master") + version("1.2.1", sha256="2b47f0d23f6d25ca4fc0601b93a98167bbfb4b8aa6a1bba16d0391569e99e6f0") version("1.2.0", sha256="3448606fceb98ceb72d687d2d3b7ad44c67793d799def4ece9601b8e39c2868a") version("1.1.20", sha256="e1c75e480fc72bca8f8072ea00320878a9ae375eed7401628b15cddd097ed7fd") version("1.1.19", sha256="4c586b57fd4e30be044366c9be983249c7fa8bec629624523f5f69fd9caaa05b") @@ -59,6 +60,11 @@ class Vecgeom(CMakePackage, CudaPackage): depends_on("veccore@0.4.2", when="@:1.0") conflicts("+cuda", when="@:1.1.5") + conflicts( + "%gcc@11.3:", + when="+cuda ^cuda@:11.6", + msg="vecgeom's CUDA support cannot be built with GCC >= 11.3 using CUDA < 11.7", + ) conflicts("cxxstd=14", when="@1.2:") conflicts("cxxstd=11", when="@1.2:") -- cgit v1.2.3-70-g09d2