Switch to uberenv submodule

LLNL · Aug 3, 2021 · ac64188 · ac64188
1 parent 84c08e9
commit ac64188
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 1,538 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "scripts/radiuss-spack-configs"]
 	path = scripts/radiuss-spack-configs
 	url = https://github.com/LLNL/radiuss-spack-configs
+[submodule "scripts/uberenv"]
+	path = scripts/uberenv
+	url = https://github.com/LLNL/uberenv.git
diff --git a/scripts/uberenv/project.json → .uberenv_config.json b/scripts/uberenv/project.json → .uberenv_config.json
@@ -6,5 +6,6 @@
 "spack_url": "https://github.com/davidbeckingsale/spack",
 "spack_branch": "feature/allow-untested-cuda-versions",
 "spack_commit": "f96e256bee1948aa030916aae0c1b2645230fb9f",
-"spack_activate" : {}
-}
+"spack_activate" : {},
+"spack_configs_path": "scripts/radiuss-spack-configs",
+"spack_packages_path": "scripts/spack_packages"}
diff --git a/scripts/uberenv/packages/chai/package.py → scripts/spack_packages/chai/package.py b/scripts/uberenv/packages/chai/package.py → scripts/spack_packages/chai/package.py
diff --git a/scripts/uberenv/packages/raja/package.py → scripts/spack_packages/raja/package.py b/scripts/uberenv/packages/raja/package.py → scripts/spack_packages/raja/package.py
diff --git a/...ges/umpire/camp_target_umpire_3.0.0.patch → ...ges/umpire/camp_target_umpire_3.0.0.patch b/...ges/umpire/camp_target_umpire_3.0.0.patch → ...ges/umpire/camp_target_umpire_3.0.0.patch
diff --git a/scripts/uberenv/packages/umpire/package.py → scripts/spack_packages/umpire/package.py b/scripts/uberenv/packages/umpire/package.py → scripts/spack_packages/umpire/package.py
diff --git a/scripts/uberenv b/scripts/uberenv
diff --git a/scripts/uberenv/LICENSE b/scripts/uberenv/LICENSE
diff --git a/scripts/uberenv/Makefile b/scripts/uberenv/Makefile
diff --git a/scripts/uberenv/README.md b/scripts/uberenv/README.md