diff options
author | Harmen Stoppels <me@harmenstoppels.nl> | 2023-10-25 20:55:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-25 11:55:04 -0700 |
commit | c0a4be156ceb02773687e3dd8d95af772415b1ab (patch) | |
tree | 051c1161fb613f0505e3c4355c76944434929e6d /var | |
parent | 0c30418732d67afd224172763e07d64316ae7933 (diff) | |
download | spack-c0a4be156ceb02773687e3dd8d95af772415b1ab.tar.gz spack-c0a4be156ceb02773687e3dd8d95af772415b1ab.tar.bz2 spack-c0a4be156ceb02773687e3dd8d95af772415b1ab.tar.xz spack-c0a4be156ceb02773687e3dd8d95af772415b1ab.zip |
ci: don't put compilers in config (#40700)
* ci: don't register detectable compilers
Cause they go out of sync...
* remove intel compiler, it can be detected too
* Do not run spack compiler find since compilers are registered in concretize job already
* trilinos: work around +stokhos +cuda +superlu-dist bug due to EMPTY macro
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 9af8ab14dc..1681ac35d2 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -358,6 +358,11 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): conflicts("@:13.0.1 +cuda", when="^cuda@11:") # Build hangs with CUDA 11.6 (see #28439) conflicts("+cuda +stokhos", when="^cuda@11.6:") + # superlu-dist defines a macro EMPTY which conflicts with a header in cuda + # used when building stokhos + # Fix: https://github.com/xiaoyeli/superlu_dist/commit/09cb1430f7be288fd4d75b8ed461aa0b7e68fefe + # is not tagged yet. See discussion here https://github.com/trilinos/Trilinos/issues/11839 + conflicts("+cuda +stokhos +superlu-dist") # Cuda UVM must be enabled prior to 13.2 # See https://github.com/spack/spack/issues/28869 conflicts("~uvm", when="@:13.1 +cuda") |