Sync <- Mlperf inference

.github/workflows/build_wheel.yml

@@ -39,7 +39,9 @@ jobs:
       - name: Check if VERSION file has changed
         id: version_changed
         run: |
-          if git diff --name-only HEAD~1 | grep -q "VERSION"; then
+          git config --global user.name mlcommons-bot
+          git config --global user.email "[email protected]"
+          if git diff --name-only $(git merge-base HEAD HEAD~1) | grep -q "VERSION"; then
             echo "VERSION file has been modified"
             echo "::set-output name=version_changed::true"
             new_version=$(cat VERSION)
@@ -71,22 +73,28 @@ jobs:
       - name: Commit updated version
         if: steps.version_changed.outputs.version_changed == 'false'
         run: |
-          git config --global user.name "${{ github.actor }}"
-          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
           git add VERSION
           git commit -m "Increment version to ${{ steps.do_version_increment.outputs.new_version }}"
           git push
 
-      # Step 6: Install required dependencies
+      # Step 6: Update the git hash in the repository
+      - name: Commit updated git hash
+        run: |
+          python3 get_git_version.py > git_commit_hash.txt
+          git add git_commit_hash.txt
+          git commit -m "Updated git_commit_hash.txt"
+          git push
+
+      # Step 7: Install required dependencies
       - name: Install requirements
         run: python3 -m pip install setuptools wheel build
 
-      # Step 7: Build the Python wheel
+      # Step 8: Build the Python wheel
       - name: Build wheels
         working-directory: ./
         run: python3 -m build && rm dist/*.whl
 
-      # Step 8: Publish to PyPI
+      # Step 9: Publish to PyPI
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

MANIFEST.in

@@ -1,2 +1,3 @@
 include README.md
 include VERSION
+include git_commit_hash.txt

VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

get_git_version.py

@@ -0,0 +1,14 @@
+import subprocess
+
+def get_git_commit_hash():
+    try:
+        commit_hash = subprocess.check_output(
+            ['git', 'rev-parse', 'HEAD'],
+            stderr=subprocess.STDOUT
+        ).strip().decode('utf-8')
+        return commit_hash
+    except Exception:
+        return "unknown"
+
+if __name__ == "__main__":
+    print(get_git_commit_hash())

git_commit_hash.txt

@@ -0,0 +1 @@
+96af8d0b5faedcd2d06be33cb9e01d4641268458

pyproject.toml

@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools>=60", "wheel", "cmind"]
+requires = ["setuptools>=60", "wheel", "cmind @ git+https://[email protected]/mlcommons/ck.git@084d4d6171a6e7ae9582a63777fbd19afa19947a#egg=cmind&subdirectory=cm"]

setup.py

@@ -131,9 +131,11 @@ def command_exists(self, command):
             return subprocess.call([command, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) == 0
 
     def custom_function(self):
+        commit_hash = get_commit_hash()
         import cmind
         #r = cmind.access({'action':'rm', 'automation':'repo', 'data_uoa':'mlcommons@cm4mlops', 'force': True})
-        r = cmind.access({'action':'pull', 'automation':'repo', 'artifact':'mlcommons@cm4mlops', 'branch': 'mlperf-inference'})
+        r = cmind.access({'action':'pull', 'automation':'repo', 'artifact':'mlcommons@cm4mlops', 'branch': 'mlperf-inference', 'checkout': commit_hash})
+        #r = cmind.access({'action':'pull', 'automation':'repo', 'artifact':'mlcommons@cm4mlops', 'checkout': commit_hash})
         print(r)
         if r['return'] > 0:
             return r['return']
@@ -148,6 +150,13 @@ def read_file(file_name, default=""):
             return f.read().strip()
     return default
 
+def get_commit_hash():
+    try:
+        with open(os.path.join(os.path.dirname(__file__), 'git_commit_hash.txt'), 'r') as f:
+            return f.read().strip()
+    except FileNotFoundError:
+        return "unknown"
+
 long_description = read_file("README.md", "No description available.")
 version_ = read_file("VERSION", "0.3.1")