Merge branch 'develop' into features/shared

2020-02-25 11:50:23 -05:00
parent ec78160569 8d8925c725
commit 8b63c4555c
375 changed files with 17538 additions and 1552 deletions
--- a/etc/spack/defaults/config.yaml
+++ b/etc/spack/defaults/config.yaml
@@ -137,7 +137,7 @@ config:
  # when Spack needs to manage its own package metadata and all operations are
  # expected to complete within the default time limit. The timeout should
  # therefore generally be left untouched.
-  db_lock_timeout: 120
+  db_lock_timeout: 3


  # How long to wait when attempting to modify a package (e.g. to install it).
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -43,6 +43,7 @@ packages:
      szip: [libszip, libaec]
      tbb: [intel-tbb]
      unwind: [libunwind]
+      sycl: [hipsycl]
    permissions:
      read: world
      write: user