CM/CMX v4.1.4: bug fixes (mlcommons#1413)

Author: gfursin

.github/workflows/test-cmx.yml

@@ -38,6 +38,8 @@ jobs:
         python3 -m pip install --ignore-installed --verbose pip setuptools
         python3 -m pip install cmind
         python3 -m cmind
+#        cmx pull repo mlcommons@ck --dir=cm4mlops/cm4mlops
+        cmx pull repo mlcommons@ck --dir2=cm4mlops
     - name: Test
       run: |
         python tests/test_cm.py

cm/CHANGES.md

@@ -1,5 +1,6 @@
-## CMX V4.1.3.1
+## CMX V4.1.4
    - fixed minor bug for "cmx --version"
+   - added "cmx pull repo --dir2" to support "dir/dir" directories
 
 ## CMX V4.1.3
    - fixed a bug with "cmx -log" (#1410)

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.3.1"
+__version__ = "4.1.4"
 
 from cmind.core import access
 from cmind.core import x

cm/cmind/repo/automation/repo/module.py

@@ -43,6 +43,7 @@ def pull(self, i):
           (checkout) (str): Git checkout
           (checkout_only) (bool): only checkout existing repo
           (dir) (str): use repository in this directory
+          (dir2) (str): use repository in this "directory/directory"
           (depth) (int): Git depth
           (desc) (str): brief repository description (1 line)
           (prefix) (str): extra directory to keep CM artifacts
@@ -75,6 +76,11 @@ def pull(self, i):
         checkout_only = i.get('checkout_only', False)
         skip_zip_parent_dir = i.get('skip_zip_parent_dir', False)
 
+        dir2 = i.get('dir2', '')
+        if dir2 != '':
+            i['dir'] = dir2 + '/' + dir2
+            del (i['dir2'])
+
         # Check alias is URL
         if url == '' and (alias.startswith('https://') or alias.startswith('git@')):
             url = alias