Cleanup pip install in get-sys-utils-cm

mlcommons · Aug 4, 2023 · 01a474c · 01a474c
1 parent 7192284
commit 01a474c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/cm-mlops/script/get-sys-utils-cm/run-arch.sh b/cm-mlops/script/get-sys-utils-cm/run-arch.sh
@@ -31,4 +31,5 @@ ${CM_SUDO} ${CM_PACKAGE_TOOL} -Syu && \
            xz \
            zip 
 
-python3 -m pip install -r ${CM_TMP_CURRENT_SCRIPT_PATH}/requirements.txt ${CM_PYTHON_PIP_USER}
+. ${CM_TMP_CURRENT_SCRIPT_PATH}/do_pip_installs.sh
+test $? -eq 0 || exit $?
diff --git a/cm-mlops/script/get-sys-utils-cm/run-debian.sh b/cm-mlops/script/get-sys-utils-cm/run-debian.sh
@@ -52,4 +52,5 @@ ${CM_SUDO} ${CM_APT_TOOL} update && \
            libgl1 \
            libncurses5
 
-python3 -m pip install -r ${CM_TMP_CURRENT_SCRIPT_PATH}/requirements.txt ${CM_PYTHON_PIP_USER}
+. ${CM_TMP_CURRENT_SCRIPT_PATH}/do_pip_installs.sh
+test $? -eq 0 || exit $?
diff --git a/cm-mlops/script/get-sys-utils-cm/run-macos.sh b/cm-mlops/script/get-sys-utils-cm/run-macos.sh
@@ -35,4 +35,5 @@ brew update && \
            zlib \
            python3
 
-python3 -m pip install -r ${CM_TMP_CURRENT_SCRIPT_PATH}/requirements.txt ${CM_PYTHON_PIP_USER}
+. ${CM_TMP_CURRENT_SCRIPT_PATH}/do_pip_installs.sh
+test $? -eq 0 || exit $?
diff --git a/cm-mlops/script/get-sys-utils-cm/run-rhel.sh b/cm-mlops/script/get-sys-utils-cm/run-rhel.sh
@@ -34,4 +34,5 @@ ${CM_SUDO} ${CM_PACKAGE_TOOL} update && \
            xz \
            zip 
 
-python3 -m pip install -r ${CM_TMP_CURRENT_SCRIPT_PATH}/requirements.txt ${CM_PYTHON_PIP_USER}
+. ${CM_TMP_CURRENT_SCRIPT_PATH}/do_pip_installs.sh
+test $? -eq 0 || exit $?
diff --git a/cm-mlops/script/get-sys-utils-cm/run-sles.sh b/cm-mlops/script/get-sys-utils-cm/run-sles.sh
@@ -34,4 +34,5 @@ ${CM_SUDO} ${CM_PACKAGE_TOOL} update && \
            xz \
            zip 
 
-python3 -m pip install -r ${CM_TMP_CURRENT_SCRIPT_PATH}/requirements.txt ${CM_PYTHON_PIP_USER}
+. ${CM_TMP_CURRENT_SCRIPT_PATH}/do_pip_installs.sh
+test $? -eq 0 || exit $?
diff --git a/cm-mlops/script/get-sys-utils-cm/run-ubuntu.sh b/cm-mlops/script/get-sys-utils-cm/run-ubuntu.sh
@@ -55,5 +55,7 @@ ${CM_SUDO} ${CM_APT_TOOL} update && \
            unzip \
            libgl1-mesa-glx \
            zlib1g-dev
+test $? -eq 0 || exit $?
 
-python3 -m pip install -r ${CM_TMP_CURRENT_SCRIPT_PATH}/requirements.txt ${CM_PYTHON_PIP_USER} ${CM_PYTHON_PIP_COMMON_EXTRA}
+. ${CM_TMP_CURRENT_SCRIPT_PATH}/do_pip_installs.sh
+test $? -eq 0 || exit $?