Merge branch 'dev' into rgat-anandhu

mlcommons · Dec 9, 2024 · ae8cf2f · ae8cf2f
2 parents c056f08 + c8bf646
commit ae8cf2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.10
+0.6.11
diff --git a/git_commit_hash.txt b/git_commit_hash.txt
@@ -1 +1 @@
-234d8c41e9a8a6dcb13607e4dc7626fc06f017fb
+f5e04069c8d7395be34f94fa8a94edc6c317b58e
diff --git a/script/get-mlperf-inference-loadgen/run.sh b/script/get-mlperf-inference-loadgen/run.sh
@@ -25,14 +25,14 @@ cmake \
     -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
      "${CM_MLPERF_INFERENCE_SOURCE}/loadgen" \
      -DPYTHON_EXECUTABLE:FILEPATH="${CM_PYTHON_BIN_WITH_PATH}" -B .
-if [ ${?} -ne 0 ]; then exit $?; fi
+test $? -eq 0 || exit $?
 
 echo "******************************************************"
 CM_MAKE_CORES=${CM_MAKE_CORES:-${CM_HOST_CPU_TOTAL_CORES}}
 CM_MAKE_CORES=${CM_MAKE_CORES:-2}
 
 cmake --build . --target install -j "${CM_MAKE_CORES}"
-if [ ${?} -ne 0 ]; then exit $?; fi
+test $? -eq 0 || exit $?
 
 # Clean build directory (too large)
 cd "${CUR_DIR}"
@@ -43,8 +43,7 @@ fi
 
 cd "${CM_MLPERF_INFERENCE_SOURCE}/loadgen"
 ${CM_PYTHON_BIN_WITH_PATH} -m pip install . --target="${MLPERF_INFERENCE_PYTHON_SITE_BASE}"
-
-if [ ${?} -ne 0 ]; then exit $?; fi
+test $? -eq 0 || exit $?
 
 # Clean the built wheel
 #find . -name 'mlcommons_loadgen*.whl' | xargs rm

diff --git a/script/get-mlperf-inference-src/_cm.yaml b/script/get-mlperf-inference-src/_cm.yaml
@@ -78,8 +78,6 @@ variations:
     base:
     - _branch.deepsparse
     - _repo.https://github.com/neuralmagic/inference
-    env:
-      CM_MLPERF_LAST_RELEASE: v4.0
   full-history:
     env:
       CM_GIT_DEPTH: ''
@@ -139,7 +137,7 @@ versions:
       CM_MLPERF_LAST_RELEASE: v4.1
   deepsparse:
     env:
-      CM_MLPERF_LAST_RELEASE: v4.0
+      CM_MLPERF_LAST_RELEASE: v4.1
       CM_TMP_GIT_CHECKOUT: deepsparse
       CM_TMP_GIT_URL: https://github.com/neuralmagic/inference
   main:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		234d8c41e9a8a6dcb13607e4dc7626fc06f017fb
		f5e04069c8d7395be34f94fa8a94edc6c317b58e