experimaestro 1.3.6__py3-none-any.whl → 1.4.0__py3-none-any.whl

experimaestro/__main__.py

@@ -13,6 +13,7 @@ import subprocess
 from termcolor import colored, cprint
 
 import experimaestro
+from experimaestro.experiments.cli import experiments_cli
 import experimaestro.launcherfinder.registry as launcher_registry
 
 # --- Command line main options
@@ -74,6 +75,10 @@ def cli(ctx, quiet, debug, traceback):
     ctx.obj.traceback = traceback
 
 
+# Adds the run-experiment command
+cli.add_command(experiments_cli, "run-experiment")
+
+
 @cli.command(help="Get version")
 def version():
     print(experimaestro.__version__)

experimaestro/experiments/__init__.py

@@ -0,0 +1,2 @@
+from .cli import experiments_cli, ExperimentHelper, ExperimentCallable  # noqa: F401
+from .configuration import configuration, ConfigurationBase  # noqa: F401

experimaestro/experiments/cli.py

@@ -0,0 +1,220 @@
+import inspect
+import json
+import logging
+import sys
+from pathlib import Path
+from typing import Any, List, Optional, Protocol, Tuple, Dict
+
+import click
+import omegaconf
+import yaml
+from experimaestro import LauncherRegistry, RunMode, experiment
+from experimaestro.experiments.configuration import ConfigurationBase
+from experimaestro.settings import get_workspace
+from omegaconf import OmegaConf, SCMode
+from termcolor import cprint
+
+
+class ExperimentHelper:
+    """Helper for experiments"""
+
+    # The experiment
+    xp: experiment
+
+    #: Run function
+    callable: "ExperimentCallable"
+
+    def __init__(self, callable: "ExperimentCallable"):
+        self.callable = callable
+
+    """Handles extra arguments"""
+
+    def run(self, args: List[str], configuration: ConfigurationBase):
+        assert len(args) == 0
+        self.callable(self, configuration)
+
+
+class ExperimentCallable(Protocol):
+    """Protocol for the run function"""
+
+    def __call__(self, helper: ExperimentHelper, configuration: Any):
+        ...
+
+
+def load(yaml_file: Path):
+    """Loads a YAML file, and parents one if they exist"""
+    if not yaml_file.exists() and yaml_file.suffix != ".yaml":
+        yaml_file = yaml_file.with_suffix(".yaml")
+
+    with yaml_file.open("rt") as fp:
+        _data = yaml.full_load(fp)
+    data = [_data]
+    if parent := _data.get("parent", None):
+        data.extend(load(yaml_file.parent / parent))
+
+    return data
+
+
+@click.option("--debug", is_flag=True, help="Print debug information")
+@click.option("--show", is_flag=True, help="Print configuration and exits")
+@click.option(
+    "--env",
+    help="Define one environment variable",
+    type=(str, str),
+    multiple=True,
+)
+@click.option(
+    "--host",
+    type=str,
+    default=None,
+    help="Server hostname (default to localhost,"
+    " not suitable if your jobs are remote)",
+)
+@click.option(
+    "--run-mode",
+    type=click.Choice(RunMode),
+    default=RunMode.NORMAL,
+    help="Sets the run mode",
+)
+@click.option(
+    "--xpm-config-dir",
+    type=Path,
+    default=None,
+    help="Path for the experimaestro config directory "
+    "(if not specified, use $HOME/.config/experimaestro)",
+)
+@click.option(
+    "--port",
+    type=int,
+    default=None,
+    help="Port for monitoring (can be defined in the settings.yaml file)",
+)
+@click.option(
+    "--file", "xp_file", help="The file containing the main experimental code"
+)
+@click.option(
+    "--workdir",
+    type=str,
+    default=None,
+    help="Working directory - if None, uses the default XPM " "working directory",
+)
+@click.option("--conf", "-c", "extra_conf", type=str, multiple=True)
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
+@click.argument("yaml_file", metavar="YAML file", type=str)
+@click.command()
+def experiments_cli(
+    yaml_file: str,
+    xp_file: str,
+    host: str,
+    port: int,
+    xpm_config_dir: Path,
+    workdir: Optional[Path],
+    env: List[Tuple[str, str]],
+    run_mode: RunMode,
+    extra_conf: List[str],
+    args: List[str],
+    show: bool,
+    debug: bool,
+):
+    """Run an experiment"""
+    # --- Set the logger
+    logging.getLogger().setLevel(logging.DEBUG if debug else logging.INFO)
+    logging.getLogger("xpm.hash").setLevel(logging.INFO)
+
+    # --- Loads the YAML
+    yamls = load(Path(yaml_file))
+
+    # --- Get the XP file
+    if xp_file is None:
+        for data in yamls:
+            if xp_file := data.get("file"):
+                del data["file"]
+                break
+
+        if xp_file is None:
+            raise ValueError("No experiment file given")
+
+    # --- Set some options
+
+    if xpm_config_dir is not None:
+        assert xpm_config_dir.is_dir()
+        LauncherRegistry.set_config_dir(xpm_config_dir)
+
+    # --- Loads the XP file
+    xp_file = Path(xp_file)
+    if not xp_file.exists() and xp_file.suffix != ".py":
+        xp_file = xp_file.with_suffix(".py")
+    xp_file = Path(yaml_file).parent / xp_file
+
+    with open(xp_file, "r") as f:
+        source = f.read()
+    if sys.version_info < (3, 9):
+        the__file__ = str(xp_file)
+    else:
+        the__file__ = str(xp_file.absolute())
+
+    code = compile(source, filename=the__file__, mode="exec")
+    _locals: Dict[str, Any] = {}
+
+    sys.path.append(str(xp_file.parent.absolute()))
+    try:
+        exec(code, _locals, _locals)
+    finally:
+        sys.path.pop()
+
+    # --- ... and runs it
+    helper = _locals.get("run", None)
+    if helper is None:
+        raise ValueError(f"Could not find run function in {the__file__}")
+
+    if not isinstance(helper, ExperimentHelper):
+        helper = ExperimentHelper(helper)
+
+    parameters = inspect.signature(helper.callable).parameters
+    list_parameters = list(parameters.values())
+    assert len(list_parameters) == 2, (
+        "Callable function should only "
+        f"have two arguments (got {len(list_parameters)})"
+    )
+
+    schema = list_parameters[1].annotation
+    omegaconf_schema = OmegaConf.structured(schema())
+
+    configuration = OmegaConf.merge(*yamls)
+    if extra_conf:
+        configuration.merge_with(OmegaConf.from_dotlist(extra_conf))
+    if omegaconf_schema is not None:
+        try:
+            configuration = OmegaConf.merge(omegaconf_schema, configuration)
+        except omegaconf.errors.ConfigKeyError as e:
+            cprint(f"Error in configuration:\n\n{e}", "red", file=sys.stderr)
+            sys.exit(1)
+
+    # Move to an object container
+    configuration: schema = OmegaConf.to_container(
+        configuration, structured_config_mode=SCMode.INSTANTIATE
+    )
+
+    if show:
+        print(json.dumps(OmegaConf.to_container(configuration)))  # noqa: T201
+        sys.exit(0)
+
+    # Get the working directory
+    if workdir is None or not Path(workdir).is_dir():
+        workdir = get_workspace(workdir).path.expanduser().resolve()
+        logging.info("Using working directory %s", workdir)
+
+    # --- Runs the experiment
+    with experiment(
+        workdir, configuration.id, host=host, port=port, run_mode=run_mode
+    ) as xp:
+        # Set up the environment
+        for key, value in env:
+            xp.setenv(key, value)
+
+        # Run the experiment
+        helper.xp = xp
+        helper.run(list(args), configuration)
+
+        # ... and wait
+        xp.wait()

experimaestro/experiments/configuration.py

@@ -0,0 +1,32 @@
+from typing import Optional
+import attr
+
+try:
+    from typing import dataclass_transform
+except ImportError:
+    from typing_extensions import dataclass_transform
+
+
+@dataclass_transform(kw_only_default=True)
+def configuration(*args, **kwargs):
+    """Method to define keyword only dataclasses
+
+    Configurations are keyword-only
+    """
+
+    return attr.define(*args, kw_only=True, slots=False, hash=True, eq=True, **kwargs)
+
+
+@configuration()
+class ConfigurationBase:
+    id: str
+    """ID of the experiment"""
+
+    description: str = ""
+    """Description of the experiment"""
+
+    file: str = "experiment"
+    """qualified name (relative to the module) for the file containing a run function"""
+
+    parent: Optional[str]
+    """Relative path of a YAML file that should be merged"""

{experimaestro-1.3.6.dist-info → experimaestro-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: experimaestro
-Version: 1.3.6
+Version: 1.4.0
 Summary: "Experimaestro is a computer science experiment manager"
 Home-page: https://github.com/experimaestro/experimaestro-python
 License: GPL-3

{experimaestro-1.3.6.dist-info → experimaestro-1.4.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 experimaestro/__init__.py,sha256=TURptLVx9XunBd01lO4TYZACrP5rnMRnh_XE0T0_MwQ,1533
-experimaestro/__main__.py,sha256=9TIUAidbzgZF84qU-ZSWztycpPwqSfrKuA8B18r4-bA,13383
+experimaestro/__main__.py,sha256=iRi6yRJVcthXRTVnHQB0TNOKTRmKjdnX6yIQaf-z79o,13528
 experimaestro/annotations.py,sha256=dcpFmo01T12S_y5nIBIQjiXsGsq5S80ZB-58o8tW9wA,8450
 experimaestro/checkers.py,sha256=ZCMbnE_GFC5compWjt-fuHhPImi9fCPjImF8Ow9NqK8,696
 experimaestro/click.py,sha256=HTfjm4poqfG69MIYztrPWEei5OVnd154UCr2pJm6yp8,2390
@@ -17,6 +17,9 @@ experimaestro/core/serialization.py,sha256=nLlSSqerH9lqiWvqkCxz0YRRW8M1y56ainZ9_
 experimaestro/core/serializers.py,sha256=R_CAMyjjfU1oi-eHU6VlEUixJpFayGqEPaYu7VsD9xA,1197
 experimaestro/core/types.py,sha256=jQGlyC1xnsZ5NKct3FELIcXcXQMvNQvauCEuumyfBz8,19253
 experimaestro/core/utils.py,sha256=jKmZqovj5BhmWQ0rXd3YFToSbIFTylC48NhCwxo3QfU,493
+experimaestro/experiments/__init__.py,sha256=GcpDUIbCvhnv6rxFdAp4wTffCVNTv-InY6fbQAlTy-o,159
+experimaestro/experiments/cli.py,sha256=QJ04wB0O3O0X0SEHM-Y8peA74lE1WIDesbk9_RsghL0,6216
+experimaestro/experiments/configuration.py,sha256=bwoszuFWFT2fmaL7RNefNschBGpydDQkSgcSmLJ8gek,787
 experimaestro/filter.py,sha256=DN1PrmS9yXoOa5Xnv001zbxzpdzvcVZFI9xZFKZ1-6g,5794
 experimaestro/generators.py,sha256=9NQ_TfDfASkArLnO4PF7s5Yoo9KWjlna2DCPzk5gJOI,1230
 experimaestro/huggingface.py,sha256=gnVlr6SZnbutYz4PLH0Q77n1TRF-uk-dR-3UFzFqAY0,2956
@@ -137,8 +140,8 @@ experimaestro/utils/resources.py,sha256=gDjkrRjo7GULWyXmNXm_u1uqzEIAoAvJydICk56n
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/utils/yaml.py,sha256=jEjqXqUtJ333wNUdIc0o3LGvdsTQ9AKW9a9CCd-bmGU,6766
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.3.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.3.6.dist-info/METADATA,sha256=oIMCcjrUWC-mHhVFI2K2aj5d-cw3JXLMqlmID1LD4Bo,5336
-experimaestro-1.3.6.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-experimaestro-1.3.6.dist-info/entry_points.txt,sha256=PhaEili_fDgn5q7rBJGip_uhGkRBq5l3Yuhg91zkcbk,574
-experimaestro-1.3.6.dist-info/RECORD,,
+experimaestro-1.4.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.4.0.dist-info/METADATA,sha256=XWQCmuYMI4mGENdtGlEA7p0D4enym4BV3laNFmW8Kc0,5336
+experimaestro-1.4.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+experimaestro-1.4.0.dist-info/entry_points.txt,sha256=PhaEili_fDgn5q7rBJGip_uhGkRBq5l3Yuhg91zkcbk,574
+experimaestro-1.4.0.dist-info/RECORD,,