Merge branch 'mlcommons:dev' into dev

mlcommons · Dec 23, 2024 · 0521640 · 0521640
2 parents 4d0335a + 7dcef66
commit 0521640
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test-cm-based-submission-generation.yml b/.github/workflows/test-cm-based-submission-generation.yml
@@ -82,7 +82,6 @@ jobs:
         echo "::group::$description"
         cm ${{ matrix.action }} script --tags=generate,inference,submission  --version=v4.1 --clean --preprocess_submission=yes --results_dir=$PWD/submission_generation_tests/${{ matrix.case }}/ --run-checker --submitter=MLCommons --tar=yes --env.CM_TAR_OUTFILE=submission.tar.gz --division=${{ matrix.division }} --env.CM_DETERMINE_MEMORY_CONFIGURATION=yes --quiet $extra_run_args
         exit_status=$?
-        exit $? || echo "STEP_FAILED=true" >> $GITHUB_ENV
         echo "Exit status for the job ${description} ${exit_status}"
         if [[ "${{ matrix.case }}" == "case-5" || "${{ matrix.case }}" == "case-6" ]]; then
           # For cases 5 and 6, exit status should be 0 if cm command fails, 1 if it succeeds
@@ -93,7 +92,11 @@ jobs:
           fi
         else
           # For other cases, exit with the original status
-          test ${exit_status} -eq 0 || echo "STEP_FAILED=true" >> $GITHUB_ENV
+          if [[ ${exit_status} -eq 0 ]]; then
+            echo "STEP_FAILED=false" >> $GITHUB_ENV
+          else
+            echo "STEP_FAILED=true" >> $GITHUB_ENV
+          fi
         fi
         echo "::endgroup::"
     - name: Fail if Step Failed

diff --git a/script/run-docker-container/customize.py b/script/run-docker-container/customize.py
@@ -314,6 +314,8 @@ def postprocess(i):
         print('')
         docker_out = os.system(CMD)
         if docker_out != 0:
+            if docker_out % 256 == 0:
+                docker_out = 1
             return {'return': docker_out, 'error': 'docker run failed'}
 
     return {'return': 0}