From 9a76008d38585b5f7c2469a01d248524fc2648bb Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Fri, 15 Dec 2023 22:08:43 +0100 Subject: [PATCH] spack: update and fix dependencies for nvtx/roctracer - add dependency on `roctracer-dev` when(+rocm+nvtx) - conflict +nvtx when neither rocm nor cuda is enabled --- spack/packages/sirius/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spack/packages/sirius/package.py b/spack/packages/sirius/package.py index 82e868a81..ccc245131 100644 --- a/spack/packages/sirius/package.py +++ b/spack/packages/sirius/package.py @@ -106,7 +106,9 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): variant( "profiler", default=True, description="Use internal profiler to measure execution time" ) - variant("nvtx", default=False, description="Use NVTX profiler") + variant( + "nvtx", default=False, description="Use NVTX/ROCTX profiler" + ) depends_on("cmake@3.23:", type="build") depends_on("mpi") @@ -150,6 +152,7 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): depends_on("nlcglib+cuda", when="+nlcglib+cuda") depends_on("libvdwxc@0.3.0:+mpi", when="+vdwxc") + depends_on("roctracer-dev", when="+nvtx+rocm") depends_on("scalapack", when="+scalapack") @@ -168,6 +171,7 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): conflicts("^libxc@5.0.0") # known to produce incorrect results conflicts("+single_precision", when="@:7.2.4") conflicts("+scalapack", when="^cray-libsci") + conflicts("+nvtx", when="~cuda~rocm") # Propagate openmp to blas depends_on("openblas threads=openmp", when="+openmp ^openblas")