No more global config

Author: tanner-andrulis

accelforge/frontend/config.py

@@ -8,28 +8,6 @@
 import os
 import sys
 
-USER_CUSTOM_CONFIG_PATH_VAR = "ACCELFORGE_CONFIG_PATH"
-
-
-def get_config() -> "Config":
-    if USER_CUSTOM_CONFIG_PATH_VAR in os.environ:
-        f = os.environ[USER_CUSTOM_CONFIG_PATH_VAR]
-    elif hasattr(sys, "real_prefix") or (
-        hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
-    ):
-        f = os.path.join(sys.prefix, "accelforge", "config.yaml")
-    else:
-        f = os.path.join(user_config_dir("accelforge"), "config.yaml")
-
-    if not os.path.exists(f):
-        logging.warning(f"No configuration file found. Creating config file at {f}.")
-        os.makedirs(os.path.dirname(f), exist_ok=True)
-        config = Config()
-        config.to_yaml(f)
-
-    logging.warning(f"Loading configuration file from {f}")
-    return Config.from_yaml(f)
-
 
 class Config(EvalableModel):
     expression_custom_functions: EvalableList[str | Callable] = EvalableList()

accelforge/frontend/spec.py

@@ -7,7 +7,7 @@
 
 from accelforge.frontend.workload import Workload
 from accelforge.frontend.variables import Variables
-from accelforge.frontend.config import Config, get_config
+from accelforge.frontend.config import Config
 from accelforge.frontend.mapping import Mapping
 from accelforge.frontend.model import Model
 import hwcomponents
@@ -37,7 +37,7 @@ class Spec(EvalableModel):
     variables: Variables = Variables()
     """ Variables that can be referenced in other places in the spec. """
 
-    config: Config = Field(default_factory=get_config)
+    config: Config = Config()
     """ Configuration settings. """
 
     renames: Renames = Renames()

accelforge/mapper/FFM/_make_pmappings/make_pmappings_from_templates/run_model.py

@@ -155,7 +155,10 @@ def run_model(
 
     per_memory_usage_df = {}
     for memory, occupancies in total_occupancy.items():
-        if job.ignored_resources is not None and memory not in job.ignored_resources:
+        ignored = (
+            job.ignored_resources is not None and memory not in job.ignored_resources
+        )
+        if not ignored or metrics & Metrics.ACTIONS:
             key = f"usage<SEP>memory<SEP>{memory}"
             per_memory_usage_df[key] = (
                 sum(occupancies.values()) / memory_to_size[memory]