Merge branch 'mlperf-inference' into igbh_script_improve

mlcommons · Nov 29, 2024 · 2f823a2 · 2f823a2
2 parents 0cee8c8 + 1336831
commit 2f823a2
Show file tree

Hide file tree

Showing 106 changed files with 99 additions and 4,210 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -26,16 +26,22 @@ jobs:
           python3 -m pip install autopep8
           for FILE in $(git diff --name-only ${{ github.event.before }} | grep -E '.*\.py$')
           do
-            autopep8 --in-place -a $FILE
-            git add $FILE
+            # Check if the file still exists in the working tree
+            if [ -f "$FILE" ]; then
+              autopep8 --in-place -a "$FILE"
+              git add "$FILE"
+            fi
           done
 
       - name: Format modified C++ files
         run: |
           for FILE in $(git diff --name-only ${{ github.event.before }} | grep -E '.*\.(cc|cpp|h|hpp)$')
           do
-            clang-format -i -style=file $FILE
-            git add $FILE
+            # Check if the file still exists in the working tree
+            if [ -f "$FILE" ]; then
+              clang-format -i -style=file $FILE
+              git add $FILE
+            fi
           done
 
       - name: Commit and create PR

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,6 @@
+### 20241123
+ [November 2024 release of cm4mlops](https://github.com/mlcommons/cm4mlops/discussions/590)
+
 ### 20240927
  * added "test dummy" script to test Docker containers
  * added more standard Nvidia Docker configuration for PyTorch

diff --git a/automation/script/README-extra.md b/automation/script/README-extra.md
@@ -2,6 +2,7 @@
 
 # CM "script" automation
 
+
 <details>
 <summary>Click here to see the table of contents.</summary>
 

diff --git a/automation/script/module.py b/automation/script/module.py
@@ -1311,7 +1311,7 @@ def _run(self, i):
 
                     r = self._call_run_deps(prehook_deps, self.local_env_keys, local_env_keys_from_meta, env, state, const, const_state, add_deps_recursive,
                                             recursion_spaces + extra_recursion_spaces,
-                                            remembered_selections, variation_tags_string, found_cached, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
+                                            remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
                     if r['return'] > 0:
                         return r
 
@@ -1372,7 +1372,7 @@ def _run(self, i):
 
                         r = self._call_run_deps(posthook_deps, self.local_env_keys, clean_env_keys_post_deps, env, state, const, const_state, add_deps_recursive,
                                                 recursion_spaces + extra_recursion_spaces,
-                                                remembered_selections, variation_tags_string, found_cached, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
+                                                remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
                         if r['return'] > 0:
                             return r
 
@@ -1383,7 +1383,7 @@ def _run(self, i):
                         # Check chain of post dependencies on other CM scripts
                         r = self._call_run_deps(post_deps, self.local_env_keys, clean_env_keys_post_deps, env, state, const, const_state, add_deps_recursive,
                                                 recursion_spaces + extra_recursion_spaces,
-                                                remembered_selections, variation_tags_string, found_cached, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
+                                                remembered_selections, variation_tags_string, True, debug_script_tags, verbose, show_time, extra_recursion_spaces, run_state)
                         if r['return'] > 0:
                             return r
 
@@ -1605,6 +1605,82 @@ def _run(self, i):
                     if r['return'] > 0:
                         return r
 
+            # Prepare common input to prepare and run script
+            run_script_input = {
+                'path': path,
+                'bat_ext': bat_ext,
+                'os_info': os_info,
+                'const': const,
+                'state': state,
+                'const_state': const_state,
+                'reuse_cached': reuse_cached,
+                'recursion': recursion,
+                'recursion_spaces': recursion_spaces,
+                'remembered_selections': remembered_selections,
+                'tmp_file_run_state': self.tmp_file_run_state,
+                'tmp_file_run_env': self.tmp_file_run_env,
+                'tmp_file_state': self.tmp_file_state,
+                'tmp_file_run': self.tmp_file_run,
+                'local_env_keys': self.local_env_keys,
+                'local_env_keys_from_meta': local_env_keys_from_meta,
+                'posthook_deps': posthook_deps,
+                'add_deps_recursive': add_deps_recursive,
+                'remembered_selections': remembered_selections,
+                'found_script_tags': found_script_tags,
+                'variation_tags_string': variation_tags_string,
+                'found_cached': False,
+                'debug_script_tags': debug_script_tags,
+                'verbose': verbose,
+                'meta': meta,
+                'self': self
+            }
+
+            # Check if pre-process and detect
+            if str(meta.get('predeps', 'True')).lower() not in ["0", "false", "no"] and os.path.isfile(
+                    path_to_customize_py):  # possible duplicate execution - needs fix
+                r = utils.load_python_module(
+                    {'path': path, 'name': 'customize'})
+                if r['return'] > 0:
+                    return r
+
+                customize_code = r['code']
+
+                customize_common_input = {
+                    'input': i,
+                    'automation': self,
+                    'artifact': script_artifact,
+                    'customize': script_artifact.meta.get('customize', {}),
+                    'os_info': os_info,
+                    'recursion_spaces': recursion_spaces,
+                    'script_tags': script_tags,
+                    'variation_tags': variation_tags
+                }
+                run_script_input['customize_code'] = customize_code
+                run_script_input['customize_common_input'] = customize_common_input
+
+                if repro_prefix != '':
+                    run_script_input['repro_prefix'] = repro_prefix
+                if ignore_script_error:
+                    run_script_input['ignore_script_error'] = True
+                if 'predeps' in dir(customize_code) and not fake_run:
+
+                    logging.debug(
+                        recursion_spaces +
+                        '  - Running preprocess ...')
+
+                    run_script_input['run_state'] = run_state
+
+                    ii = copy.deepcopy(customize_common_input)
+                    ii['env'] = env
+                    ii['state'] = state
+                    ii['meta'] = meta
+                    # may need to detect versions in multiple paths
+                    ii['run_script_input'] = run_script_input
+
+                    r = customize_code.predeps(ii)
+                    if r['return'] > 0:
+                        return r
+
             # Check chain of dependencies on other CM scripts
             if len(deps) > 0:
                 logging.debug(recursion_spaces +
@@ -1626,6 +1702,8 @@ def _run(self, i):
             # Clean some output files
             clean_tmp_files(clean_files, recursion_spaces)
 
+            # Repeated code
+            '''
             # Prepare common input to prepare and run script
             run_script_input = {
                 'path': path,
@@ -1655,6 +1733,7 @@ def _run(self, i):
                 'meta': meta,
                 'self': self
             }
+            '''
             if os.path.isfile(
                     path_to_customize_py):  # possible duplicate execution - needs fix
                 r = utils.load_python_module(

diff --git a/challenge/add-derived-metrics-to-mlperf-inference/README.md b/challenge/add-derived-metrics-to-mlperf-inference/README.md
diff --git a/challenge/add-derived-metrics-to-mlperf-inference/_cm.json b/challenge/add-derived-metrics-to-mlperf-inference/_cm.json
diff --git a/challenge/automate-mlperf-inference-v3.1-and-v4.0-2024/README.md b/challenge/automate-mlperf-inference-v3.1-and-v4.0-2024/README.md
diff --git a/challenge/automate-mlperf-inference-v3.1-and-v4.0-2024/_cm.yaml b/challenge/automate-mlperf-inference-v3.1-and-v4.0-2024/_cm.yaml
diff --git a/...gh-performance-and-cost-efficient-ai-systems-based-on-mlperf-4.0-2024/README.md b/...gh-performance-and-cost-efficient-ai-systems-based-on-mlperf-4.0-2024/README.md
diff --git a/.../compose-high-performance-and-cost-efficient-ai-systems-based-on-mlperf-4.0-2024/_cm.yaml b/.../compose-high-performance-and-cost-efficient-ai-systems-based-on-mlperf-4.0-2024/_cm.yaml
diff --git a/challenge/connect-mlperf-inference-v3.1-with-openbenchmarking/README.md b/challenge/connect-mlperf-inference-v3.1-with-openbenchmarking/README.md
diff --git a/challenge/connect-mlperf-inference-v3.1-with-openbenchmarking/_cm.json b/challenge/connect-mlperf-inference-v3.1-with-openbenchmarking/_cm.json
diff --git a/challenge/connect-mlperf-with-medperf/README.md b/challenge/connect-mlperf-with-medperf/README.md
diff --git a/challenge/connect-mlperf-with-medperf/_cm.json b/challenge/connect-mlperf-with-medperf/_cm.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@

		# CM "script" automation


		<details>
		<summary>Click here to see the table of contents.</summary>

Expand Down