CM/CMX V3.4.4 (#1364)

- improved error reporting in utils.load_json and utils.load_yaml - added utils.substitute_template - enhanced 'cm pull repo' based on user feedback
mlcommons · Nov 28, 2024 · 3d6c27e · 3d6c27e
2 parents 68e5120 31e6e82
commit 3d6c27e
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -57,6  57,10 @@ CK consists of several sub-projects:
 * Copyright (c) 2021-2024 MLCommons
 * Copyright (c) 2014-2021 cTuning foundation
 
 ### Author
 
 * [Grigori Fursin](https://cKnowledge.org/gfursin) (FlexAI, cTuning)
 
 ### Maintainers
 
 * CM/CM4Research/CM4MLPerf-results: [Grigori Fursin](https://cKnowledge.org/gfursin)

diff --git a/cm/CHANGES.md b/cm/CHANGES.md
@@ -1,5  1,7 @@
-## V3.4.3.1
-   - enhancing 'cm pull repo' based on user feedback
 ## V3.4.4
    - improved error reporting in utils.load_json and utils.load_yaml
    - added utils.substitute_template
    - enhanced 'cm pull repo' based on user feedback
 
 ## V3.4.3
    - fixed pyproject.toml

diff --git a/cm/cmind/__init__.py b/cm/cmind/__init__.py
@@ -2,7  2,7 @@
 #
 # Written by Grigori Fursin
 
-__version__ = "3.4.3.1"
 __version__ = "3.4.4"
 
 from cmind.core import access
 from cmind.core import x

diff --git a/cm/cmind/utils.py b/cm/cmind/utils.py
@@ -204,7  204,7 @@ def load_json(file_name, check_if_exists = False, encoding='utf8'):
         try:
             meta = json.load(jf)
         except Exception as e:
-            return {'return':4, 'error': format(e)}
             return {'return':4, 'error': f'detected problem in {file_name}: {e}'}
 
     return {'return':0, 'meta': meta}
 
@@ -274,7  274,7 @@ def load_yaml(file_name, check_if_exists = False, encoding = 'utf8'):
                 # To support old versions
                 meta = yaml.safe_load(yf)
         except Exception as e:
-            return {'return':4, 'error': format(e)}
             return {'return':4, 'error': f'detected problem in {file_name}: {e}'}
 
     return {'return':0,
             'meta': meta}
@@ -2152,3  2152,21 @@ def digits(s, first = True):
        pass
 
     return v
 
 ##############################################################################
 def substitute_template(template, variables):
     """
     Substitutes variables in a template string with values from a dictionary.
 
     Args:
         template (str): The template string with placeholders (e.g., "something-{var1}-something-{var2}").
         vars (dict): A dictionary containing variable-value pairs (e.g., {'var1': 'a', 'var2': 'b'}).
 
     Returns:
         str: The template string with placeholders replaced by the corresponding values.
     """
     try:
         return template.format(**variables)
     except KeyError as e:
         return f"Error: Missing value for {e.args[0]} in the vars dictionary."
 
diff --git a/cmx4mlops/README.md b/cmx4mlops/README.md
@@ -0,0  1 @@
 TBD
diff --git a/cmx4mlops/cmr.yaml b/cmx4mlops/cmr.yaml
@@ -0,0  1,8 @@
 alias: cmx4mlops
 uid: 428611a6db02407f
 
 git: true
 
 version: "0.5.1"
 
 author: "Grigori Fursin"