Merge pull request #203 from mlcommons/dev

Merge Dev

Author: anandhu-eng

.github/workflows/mlperf-inference-resnet50.yml

@@ -44,6 +44,7 @@ jobs:
     - name: Test MLPerf inference ResNet50 on Windows (prebuilt loadgen)
       if: runner.os == 'Windows'
       run: |
+        git config --system core.longpaths true
         mlc run script --tags=run-mlperf,inference,_submission,_short --submitter="MLCommons" --hw_name=gh_action --model=resnet50 --implementation=${{ matrix.implementation }} --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=100 --target_qps=1 -v --quiet --adr.loadgen.tags=_from-pip --pip_loadgen=yes
 
     - name: Test MLPerf inference ResNet50 on Unix systems

.github/workflows/test-mlc-core-actions.yaml

@@ -151,13 +151,14 @@ jobs:
         mlc add repo my-new-repo
         mlc add repo https://github.com/mlcommons/inference
         mlc add repo https://mygit.com/myrepo
-      
+     
+    ' Disabled now as MLCFlow automatically deletes corrupted entries
     - name: Test 13 - rm repo where we have a corrupt entry 
       run: |
         rm -r $HOME/MLC/repos/mlcommons@mlperf-automations
         mlc rm repo mlcommons@mlperf-automations
         mlc pull repo mlcommons@mlperf-automations --branch=dev
-        
+    '   
     - name: Test 14 - add script - Add a new MLC script
       run: |
         mlc add script my-script-1 --tags=my,new-tags-1
@@ -201,14 +202,30 @@ jobs:
     - name: Test 21 - Test mlc pull repo to checkout based on particular release tag
       run: |
         mlc rm repo mlcommons@mlperf-automations -f
-        mlc pull repo mlcommons@mlperf-automations --tag=mlperf-automations-v1.0.0
+        mlc pull repo mlcommons@mlperf-automations --tag=v1.2.0
+
+    - name: Test 22 - Test silent mode
+      run: |
+        mlcr detect,cpu -j -s --quiet 
+        ! mlcr detect,cpu -j -s --quiet 2>&1 | grep -q INFO
+        ! mlcr detect,cpu -j --silent --quiet 2>&1 | grep -q INFO
+
+    - name: Test 23 - Test verbose mode
+      run: |
+        mlcr detect,cpu -j -v 2>&1 | grep -q DEBUG
+        mlcr detect,cpu -j --verbose 2>&1 | grep -q DEBUG
         
-    - name: Test 22 - Test recursive mlc pull repo
+    - name: Test 24 - Test recursive mlc pull repo
       run: |
         export MLC_REPOS=$HOME/test
         mlcp https://github.com/GATEOverflow/GO-PDFs
         mlcr detect,os -j
 
+    - name: Test 25 - Test automatic repo pull
+      run: |
+        mlc rm repo mlcommons@mlperf-automations -f
+        mlcr detect,cpu -j
+
   test_mlc_access_core_actions:
 
     runs-on: ${{ matrix.os }}

CONTRIBUTORS.md

@@ -29,11 +29,11 @@ Once your contribution exceeds 50 lines of code (in total), we will:
 ## Current Contributors
 
 - **[Arjun Suresh](https://github.com/arjunsuresh)** - *Initial Development Discussions, {Script,Cache} Action implementations*  
-- **[Anandhu Sooraj](https://github.com/anandhu-eng)** - *Initial Development Discussions, RepoAction implmentation, Github Tests*  
+- **[Anandhu Sooraj](https://github.com/anandhu-eng)** - *Initial Development Discussions, RepoAction implementation, Github Tests*
+- **[Sujith Kanakkassery](https://github.com/sujik18)** - *Initial Development Discussions, Persistent index implementation*
 - **[Shaik Masthan](https://github.com/csemasthan)** - *Initial Development Discussions*  
 - **[Sahil Avaran](https://github.com/sahilavaran)** - *Initial Development Discussions*, added logging
 - **[R.A Sidharth](https://github.com/Sid9993)** - *Find repo implementation*
-- **[Sujith Kanakkassery](https://github.com/sujik18)** - *Initial Development Discussions*, adding logging to a file
 - **[Your Name Here]** - This could be you! 🎉  
 
 ---

VERSION

@@ -1 +1 @@
-1.1.9
+1.1.14

mlc/action.py

@@ -106,8 +106,7 @@ def is_curdir_inside_path(base_path):
         # Iterate through the list of repository paths
         for repo_path in repo_paths:
             if not os.path.exists(repo_path):
-                logger.warning(f"""Warning: {repo_path} not found. Considering it as a corrupt entry and deleting automatically...""")
-                logger.warning(f"Deleting the {meta_yaml_path} entry from repos.json")
+                logger.warning(f"""Warning: {repo_path} not found. Considering it as a corrupt entry and deleting from repos.json...""")
                 from .repo_action import rm_repo
                 res = rm_repo(repo_path, os.path.join(self.repos_path, 'repos.json'), True)
 

mlc/index.py

@@ -3,6 +3,7 @@
 import json
 import yaml
 from .repo import Repo
+from datetime import datetime
 
 class CustomJSONEncoder(json.JSONEncoder):
     def default(self, obj):
@@ -35,8 +36,50 @@ def __init__(self, repos_path, repos):
             "experiment": os.path.join(repos_path, "index_experiment.json")
         }
         self.indices = {key: [] for key in self.index_files.keys()}
+        self.modified_times_file = os.path.join(repos_path, "modified_times.json")
+        self.modified_times = self._load_modified_times()
+        self._load_existing_index()
         self.build_index()
 
+    def _load_modified_times(self):
+        """
+        Load stored mtimes to check for changes in scripts.
+        """
+        if os.path.exists(self.modified_times_file):
+            try:
+                # logger.info(f"Loading modified times from {self.modified_times_file}")
+                with open(self.modified_times_file, "r") as f:
+                    return json.load(f)
+            except Exception:
+                return {}
+        return {}
+
+    def _save_modified_times(self):
+        """
+        Save updated mtimes in modified_times json file.
+        """
+        logger.debug(f"Saving modified times to {self.modified_times_file}")
+        with open(self.modified_times_file, "w") as f:
+            json.dump(self.modified_times, f, indent=4)
+
+    def _load_existing_index(self):
+        """
+        Load previously saved index to allow incremental updates.
+        """
+        for folder_type, file_path in self.index_files.items():
+            if os.path.exists(file_path):
+                try:
+                    # logger.info(f"Loading existing index for {folder_type}")
+                    with open(file_path, "r") as f:
+                        self.indices[folder_type] = json.load(f)
+                    # Convert repo dicts back into Repo objects
+                    for item in self.indices[folder_type]:
+                        if isinstance(item.get("repo"), dict):
+                            item["repo"] = Repo(**item["repo"])
+
+                except Exception:
+                    pass   # fall back to empty index
+
     def add(self, meta, folder_type, path, repo):
         if not repo:
             logger.error(f"Repo for index add for {path} is none")
@@ -87,6 +130,16 @@ def rm(self, meta, folder_type, path):
             del(self.indices[folder_type][index])
         self._save_indices()
 
+    def get_item_mtime(self,file):
+        # logger.debug(f"Getting latest modified time for file: {file}")
+        latest = 0
+        t = os.path.getmtime(file)
+        if t > latest:
+            latest = t
+            logger.debug(f"Latest modified time updated to: {latest}")
+        # logger.debug("No changes in modified time detected.")
+        return latest
+    
     def build_index(self):
         """
         Build shared indices for script, cache, and experiment folders across all repositories.
@@ -95,31 +148,158 @@ def build_index(self):
             None
         """
 
-        #for repo in os.listdir(self.repos_path):
+        # track all currently detected item paths
+        current_item_keys = set()
+        changed = False
+        repos_changed = False
+        
+        # load existing modified times
+        self.modified_times = self._load_modified_times()
+
+        index_json_path = os.path.join(self.repos_path, "index_script.json")
+
+        rebuild_index = False
+
+        #file does not exist, rebuild
+        if not os.path.exists(index_json_path):
+            logger.warning("index_script.json missing. Forcing full index rebuild...")
+            logger.debug("Resetting modified_times...")
+            self.modified_times = {}
+            self._save_modified_times()
+        else:
+            logger.debug("index_script.json exists. Skipping forced rebuild.")
+
+        #check repos.json mtime
+        repos_json_path = os.path.join(self.repos_path, "repos.json")
+        repos_mtime = os.path.getmtime(repos_json_path)
+
+        key = f"{repos_json_path}"
+        old = self.modified_times.get(key)
+        repo_old_mtime = old["mtime"] if isinstance(old, dict) else old
+
+        logger.debug(f"Current repos.json mtime: {repos_mtime}")
+        logger.debug(f"Old repos.json mtime: {repo_old_mtime}")
+        current_item_keys.add(key)
+
+        # if changed, reset indexes
+        if repo_old_mtime is None or repo_old_mtime != repos_mtime:
+            logger.debug("repos.json modified. Clearing index ........")
+            # reset indices
+            self.indices = {key: [] for key in self.index_files.keys()}
+            # record repo mtime
+            self.modified_times[key] = {
+                "mtime": repos_mtime,
+                "date_time": datetime.fromtimestamp(repos_mtime).strftime("%Y-%m-%d %H:%M:%S")
+            }
+            # clear modified times except for repos.json
+            self.modified_times = {key: self.modified_times[key]}
+            self._save_indices()
+            self._save_modified_times()
+            repos_changed = True
+        else:
+            logger.debug("Repos.json not modified")
+
         for repo in self.repos:
-            repo_path = repo.path#os.path.join(self.repos_path, repo)
+            repo_path = repo.path #os.path.join(self.repos_path, repo)
             if not os.path.isdir(repo_path):
                 continue
-
+            logger.debug(f"Checking repository: {repo_path}")
             # Filter for relevant directories in the repo
             for folder_type in ["script", "cache", "experiment"]:
+                logger.debug(f"Checking folder type: {folder_type}")
                 folder_path = os.path.join(repo_path, folder_type)
                 if not os.path.isdir(folder_path):
                     continue
 
                 # Process each automation directory
                 for automation_dir in os.listdir(folder_path):
+                    # logger.debug(f"Checking automation directory: {automation_dir}")
                     automation_path = os.path.join(folder_path, automation_dir)
                     if not os.path.isdir(automation_path):
+                        logger.debug(f"Skipping non-directory automation path: {automation_path}")
                         continue
+                    
+                    yaml_path = os.path.join(automation_path, "meta.yaml")
+                    json_path = os.path.join(automation_path, "meta.json")
 
-                    # Check for configuration files (meta.yaml or meta.json)
-                    for config_file in ["meta.yaml", "meta.json"]:
-                        config_path = os.path.join(automation_path, config_file)
-                        if os.path.isfile(config_path):
-                            self._process_config_file(config_path, folder_type, automation_path, repo)
-                            break  # Only process one config file per automation_dir
-        self._save_indices()
+                    if os.path.isfile(yaml_path):
+                        # logger.debug(f"Found YAML config file: {yaml_path}")
+                        config_path = yaml_path
+                    elif os.path.isfile(json_path):
+                        # logger.debug(f"Found JSON config file: {json_path}")
+                        config_path = json_path
+                    else:
+                        logger.debug(f"No config file found in {automation_path}, skipping")
+                        if automation_dir in self.modified_times:
+                            del self.modified_times[automation_dir]
+                        if any(automation_dir in item["path"] for item in self.indices[folder_type]):
+                            logger.debug(f"Removed index entry (if it exists) for {folder_type} : {automation_dir}")
+                            self._remove_index_entry(automation_path)
+                        self._save_indices()
+                        continue
+                    current_item_keys.add(config_path)
+                    mtime = self.get_item_mtime(config_path)
+
+                    old = self.modified_times.get(config_path)
+                    old_mtime = old["mtime"] if isinstance(old, dict) else old
+
+                    # skip if unchanged
+                    if old_mtime == mtime and repos_changed != 1:
+                        # logger.debug(f"No changes detected for {config_path}, skipping reindexing.")
+                        continue
+                    if(old_mtime is None):
+                        logger.debug(f"New config file detected: {config_path}. Adding to index.")
+                    # update mtime
+                    logger.debug(f"{config_path} is modified, index getting updated")
+                    if config_path not in self.modified_times:
+                        logger.debug(f"*************{config_path} not found in modified_times; creating new entry***************")
+
+                    self.modified_times[config_path] = {
+                        "mtime": mtime,
+                        "date_time": datetime.fromtimestamp(mtime).strftime("%Y-%m-%d %H:%M:%S")
+                    }
+                    logger.debug(f"Modified time for {config_path} updated to {mtime}")
+                    changed = True
+                    # meta file changed, so reindex
+                    self._process_config_file(config_path, folder_type, automation_path, repo)
+
+        # remove deleted scripts
+        old_keys = set(self.modified_times.keys())
+        deleted_keys = old_keys - current_item_keys
+        for key in deleted_keys:
+            logger.warning(f"Detected deleted item, removing entry form modified times: {key}")
+            del self.modified_times[key]
+            folder_key = os.path.dirname(key)
+            logger.warning(f"Removing index entry for folder: {folder_key}")
+            self._remove_index_entry(folder_key)
+            changed = True
+        logger.debug(f"Deleted keys removed from modified times and indices: {deleted_keys}")
+
+        if changed:
+            logger.debug("Changes detected, saving updated index and modified times.")
+            self._save_modified_times()
+            self._save_indices()
+            logger.debug("**************Index updated (changes detected).*************************")
+        else:
+            logger.debug("**************Index unchanged (no changes detected).********************")
+
+    def _remove_index_entry(self, key):
+        logger.debug(f"Removing index entry for {key}")
+        for ft in self.indices:
+            self.indices[ft] = [
+                item for item in self.indices[ft]
+                if key not in item["path"]
+            ]
+
+    def _delete_by_uid(self, folder_type, uid, alias):
+        """
+        Delete old index entry using UID (prevents duplicates).
+        """
+        logger.debug(f"Deleting and updating index entry for the script {alias} with UID {uid}")
+        self.indices[folder_type] = [
+            item for item in self.indices[folder_type]
+            if item["uid"] != uid
+        ]
 
     def _process_config_file(self, config_file, folder_type, folder_path, repo):
         """
@@ -133,25 +313,36 @@ def _process_config_file(self, config_file, folder_type, folder_path, repo):
         Returns:
             None
         """
+        if config_file is None:
+            logger.debug(f"No meta file in {folder_path}, skipping")
+            return
+
         try:
             # Determine the file type based on the extension
             if config_file.endswith(".yaml") or config_file.endswith(".yml"):
                 with open(config_file, "r") as f:
-                    data = yaml.safe_load(f)
+                    data = yaml.safe_load(f) or {}
             elif config_file.endswith(".json"):
                 with open(config_file, "r") as f:
-                    data = json.load(f)
+                    data = json.load(f) or {}
             else:
-                logger.info(f"Skipping {config_file}: Unsupported file format.")
+                logger.warning(f"Skipping {config_file}: Unsupported file format.")
+                return
+            
+            if not isinstance(data, dict):
+                logger.warning(f"Skipping {config_file}: Invalid or empty meta")
                 return
-
             # Extract necessary fields
             unique_id = data.get("uid")
+            if not unique_id:
+                logger.warning(f"Skipping {config_file}: missing uid")
+                return
             tags = data.get("tags", [])
             alias = data.get("alias", None)
 
             # Validate and add to indices
             if unique_id:
+                self._delete_by_uid(folder_type, unique_id, alias)
                 self.indices[folder_type].append({
                     "uid": unique_id,
                     "tags": tags,
@@ -160,7 +351,8 @@ def _process_config_file(self, config_file, folder_type, folder_path, repo):
                     "repo": repo
                 })
             else:
-                logger.info(f"Skipping {config_file}: Missing 'uid' field.")
+                logger.warning(f"Skipping {config_file}: Missing 'uid' field.")
+
         except Exception as e:
             logger.error(f"Error processing {config_file}: {e}")
 
@@ -178,6 +370,6 @@ def _save_indices(self):
             try:
                 with open(output_file, "w") as f:
                     json.dump(index_data, f, indent=4, cls=CustomJSONEncoder)
-                #logger.debug(f"Shared index for {folder_type} saved to {output_file}.")
+                logger.debug(f"Shared index for {folder_type} saved to {output_file}.")
             except Exception as e:
                 logger.error(f"Error saving shared index for {folder_type}: {e}")