diff --git a/cm/CHANGES.md b/cm/CHANGES.md index 79e123f83..e18ac60df 100644 --- a/cm/CHANGES.md +++ b/cm/CHANGES.md @@ -1,3 +1,7 @@ +## CMX V4.1.3 + - fixed a bug with "cmx -log" (#1410) + - fixed a bug with "cmx -repro" (#1409) + ## CMX V4.1.2 - fixed error reporting in cm/cmx info artifact if artifact not found - added "cmx get repo" or "cmx get repo {repo alias}" or "cm get repo" (#1405) diff --git a/cm/cmind/__init__.py b/cm/cmind/__init__.py index b117c0b9a..08c9ce97c 100644 --- a/cm/cmind/__init__.py +++ b/cm/cmind/__init__.py @@ -9,7 +9,7 @@ # White paper: https://arxiv.org/abs/2406.16791 # Project contributors: https://github.com/mlcommons/ck/blob/master/CONTRIBUTING.md -__version__ = "4.1.2.1" +__version__ = "4.1.3" from cmind.core import access from cmind.core import x diff --git a/cm/cmind/config.py b/cm/cmind/config.py index 78b317c36..d1294db0b 100644 --- a/cm/cmind/config.py +++ b/cm/cmind/config.py @@ -46,7 +46,7 @@ def __init__(self, config_file = None): "error_prefix": "CM error:", "error_prefix2": "CMX detected a problem", "info_cli": "cm {action} {automation} {artifact(s)} {flags} @input.yaml @input.json", - "info_clix": "cmx {action} {automation} {artifact(s)} {CMX control flags (-)} {CMX automation flags (--)}\ncmx -h", + "info_clix": "cmx {action} {automation} {artifact(s)} {CMX control flags (-)} {CMX automation flags (--)}\nRun `cmx -h` to display help", "default_home_dir": "CM", diff --git a/cm/cmind/core.py b/cm/cmind/core.py index 8ae0dfaf4..5ba5f76c8 100644 --- a/cm/cmind/core.py +++ b/cm/cmind/core.py @@ -308,14 +308,14 @@ def log(self, s, t = 'info'): if logger != None: if t == 'debug': - self.logger.debug(s) + logger.debug(s) elif t == 'warning': - self.logger.warning(s) + logger.warning(s) elif t == 'error': - self.logger.error(s) + logger.error(s) # info else: - self.logger.info(s) + logger.info(s) return @@ -908,7 +908,7 @@ def x(self, i, out = None): ii['control'] = {} for k in control: if not k.startswith('_') and k not in ['repro']: - ii['control'][k] = i[k] + ii['control'][k] = control[k] utils.save_json(os.path.join('cmx-repro', 'cmx-input.json'), meta = ii) diff --git a/cm/pyproject.toml b/cm/pyproject.toml index c3a662872..a38487d75 100644 --- a/cm/pyproject.toml +++ b/cm/pyproject.toml @@ -92,10 +92,11 @@ Changelog = "https://github.com/mlcommons/ck/blob/master/cm/CHANGES.md" [project.scripts] cmx = "cmind.cli:runx" -cmind = "cmind.cli:run" +cmind = "cmind.cli:runx" cm = "cmind.cli:run" cmxr = "cmind.cli:run_legacy_mlcr" cmlcr = "cmind.cli:run_legacy_mlcr" +cr = "cmind.cli:run_legacy_mlcr" cmlc = "cmind.cli:run_legacy_mlc" cmr = "cmind.cli:run_script" cmrd = "cmind.cli:docker_script"