[WIP] Refactor Command to Avoid Checking for Help and Version

lib/benchpark/cmd/audit.py

@@ -8,14 +8,8 @@
 import re
 import sys
 
-import benchpark.paths
 import benchpark.repo
 
-from benchpark.runtime import RuntimeResources
-
-bootstrapper = RuntimeResources(benchpark.paths.benchpark_home)  # noqa
-bootstrapper.bootstrap()  # noqa
-
 import ramble.config as cfg  # noqa
 
 

lib/benchpark/cmd/setup.py

@@ -15,7 +15,6 @@
 import benchpark.paths
 from benchpark.debug import debug_print
 from benchpark.runtime import RuntimeResources
-import benchpark.system
 
 
 # Note: it would be nice to vendor spack.llnl.util.link_tree, but that
@@ -41,22 +40,6 @@ def symlink_tree(src, dst, include_fn=None):
             os.symlink(src_file, dst_symlink)
 
 
-def setup_parser(root_parser):
-    root_parser.add_argument(
-        "experiment",
-        type=str,
-        help="The experiment (benchmark/ProgrammingModel) to run",
-    )
-    root_parser.add_argument(
-        "system", type=str, help="The system on which to run the experiment"
-    )
-    root_parser.add_argument(
-        "experiments_root",
-        type=str,
-        help="Where to install packages and store results for the experiments. Benchpark expects to manage this directory, and it should be empty/nonexistent the first time you run benchpark setup experiments.",
-    )
-
-
 def command(args):
     """
     experiments_root/
@@ -142,7 +125,9 @@ def include_fn(fname):
     initializer_script = experiments_root / "setup.sh"
     run_script = experiments_root / ".latest-experiment.sh"
 
-    per_workspace_setup = RuntimeResources(experiments_root)
+    per_workspace_setup = RuntimeResources(
+        experiments_root, upstream=RuntimeResources(benchpark.paths.benchpark_home)
+    )
 
     # Parse experiment YAML for package_manager
     def find(d, tag):

lib/benchpark/experiment.py

@@ -11,14 +11,8 @@
 from benchpark.directives import ExperimentSystemBase
 from benchpark.directives import variant
 import benchpark.spec
-import benchpark.paths
-import benchpark.repo
-import benchpark.runtime
 import benchpark.variant
 
-bootstrapper = benchpark.runtime.RuntimeResources(benchpark.paths.benchpark_home)
-bootstrapper.bootstrap()
-
 import ramble.language.language_base  # noqa
 import ramble.language.language_helpers  # noqa
 

lib/benchpark/paths.py

@@ -20,3 +20,5 @@ def _source_location() -> pathlib.Path:
 global_ramble_path = benchpark_home / "ramble"
 global_spack_path = benchpark_home / "spack"
 hardware_descriptions = benchpark_root / "systems" / "all_hardware_descriptions"
+checkout_versions = benchpark_root / "checkout-versions.yaml"
+remote_urls = benchpark_root / "remote-urls.yaml"

lib/benchpark/repo.py

@@ -10,15 +10,9 @@
 from enum import Enum
 
 import benchpark.paths
-import benchpark.runtime
 
 # isort: off
 
-bootstrapper = benchpark.runtime.RuntimeResources(
-    benchpark.paths.benchpark_home
-)  # noqa
-bootstrapper.bootstrap()  # noqa
-
 import llnl.util.lang  # noqa
 import ramble.language.language_base  # noqa
 import ramble.repository  # noqa

lib/benchpark/runtime.py

@@ -46,7 +46,7 @@ def run_command(command_str, env=None, stdout=None, stderr=None):
     out, err = proc.communicate()
     if proc.returncode != 0:
         raise RuntimeError(
-            f"Failed command: {command_str}\nOutput: {stdout}\nError: {stderr}"
+            f"Failed command: {command_str}\nOutput: {out}\nError: {err}"
         )
 
     return (out, err)
@@ -64,22 +64,38 @@ def __call__(self, *args):
 
 
 class RuntimeResources:
-    def __init__(self, dest):
-        self.root = benchpark.paths.benchpark_root
+    def __init__(self, dest, upstream=None):
         self.dest = pathlib.Path(dest)
+        self.upstream = upstream
 
-        checkout_versions_location = self.root / "checkout-versions.yaml"
-        with open(checkout_versions_location, "r") as yaml_file:
-            data = yaml.safe_load(yaml_file)
-            self.ramble_commit = data["versions"]["ramble"]
-            self.spack_commit = data["versions"]["spack"]
+        self.ramble_location, self.spack_location = (
+            self.dest / "ramble",
+            self.dest / "spack",
+        )
+
+        # Read pinned versions of ramble and spack
+        with open(benchpark.paths.checkout_versions, "r") as yaml_file:
+            data = yaml.safe_load(yaml_file)["versions"]
+            self.ramble_commit, self.spack_commit = data["ramble"], data["spack"]
+
+        # Read remote urls for ramble and spack
+        with open(benchpark.paths.remote_urls, "r") as yaml_file:
+            data = yaml.safe_load(yaml_file)["urls"]
+            remote_ramble_url, remote_spack_url = data["ramble"], data["spack"]
 
-        self.ramble_location = self.dest / "ramble"
-        self.spack_location = self.dest / "spack"
+        # If this does not have an upstream, then we will be cloning from the URLs indicated in remote-urls.yaml
+        if self.upstream is None:
+            self.ramble_url, self.spack_url = remote_ramble_url, remote_spack_url
+        else:
+            # Clone from local "upstream" repository
+            self.ramble_url, self.spack_url = (
+                self.upstream.ramble_location,
+                self.upstream.spack_location,
+            )
 
-    def update_old_bootstrap(self, desired_commit, location):
-        # Store first 7 of hash in checkout-versions.yaml
+    def _check_and_update_bootstrap(self, desired_commit, location):
         with working_dir(location):
+            # length of hash is 7 in checkout-versions.yaml
             current_commit = run_command("git rev-parse HEAD")[0].strip()[:7]
             if current_commit != desired_commit:
                 run_command("git fetch --all")
@@ -92,7 +108,7 @@ def bootstrap(self):
         if not self.ramble_location.exists():
             self._install_ramble()
         else:
-            self.update_old_bootstrap(self.ramble_commit, self.ramble_location)
+            self._check_and_update_bootstrap(self.ramble_commit, self.ramble_location)
         ramble_lib_path = self.ramble_location / "lib" / "ramble"
         externals = str(ramble_lib_path / "external")
         if externals not in sys.path:
@@ -107,12 +123,12 @@ def bootstrap(self):
         if not self.spack_location.exists():
             self._install_spack()
         else:
-            self.update_old_bootstrap(self.spack_commit, self.spack_location)
+            self._check_and_update_bootstrap(self.spack_commit, self.spack_location)
 
     def _install_ramble(self):
         print(f"Cloning Ramble to {self.ramble_location}")
         git_clone_commit(
-            "https://github.com/GoogleCloudPlatform/ramble.git",
+            self.ramble_url,
             self.ramble_commit,
             self.ramble_location,
         )
@@ -121,7 +137,9 @@ def _install_ramble(self):
     def _install_spack(self):
         print(f"Cloning Spack to {self.spack_location}")
         git_clone_commit(
-            "https://github.com/spack/spack.git", self.spack_commit, self.spack_location
+            self.spack_url,
+            self.spack_commit,
+            self.spack_location,
         )
         debug_print(f"Done cloning Spack ({self.spack_location})")
 

lib/benchpark/spec.py

@@ -13,12 +13,7 @@
 from typing import Iterable, Iterator, List, Match, Optional, Union
 
 from benchpark.error import BenchparkError
-import benchpark.paths
 import benchpark.repo
-import benchpark.runtime
-
-bootstrapper = benchpark.runtime.RuntimeResources(benchpark.paths.benchpark_home)
-bootstrapper.bootstrap()
 
 import llnl.util.lang  # noqa
 

lib/benchpark/system.py

@@ -7,21 +7,12 @@
 import os
 import packaging.version
 import yaml
+from typing import Dict, Tuple
 
-import benchpark.paths
 from benchpark.directives import ExperimentSystemBase
-import benchpark.repo
-from benchpark.runtime import RuntimeResources
-
-from typing import Dict, Tuple
 import benchpark.spec
 import benchpark.variant
 
-bootstrapper = RuntimeResources(benchpark.paths.benchpark_home)  # noqa
-bootstrapper.bootstrap()  # noqa
-
-_repo_path = benchpark.repo.paths[benchpark.repo.ObjectTypes.systems]
-
 
 def _hash_id(content_list):
     sha256_hash = hashlib.sha256()