2
0

Merge amd-dev into amd-master 20231218

Signed-off-by: guanyu12 <guanyu12@amd.com>
Change-Id: I1ea6639bfbfda5f3978c6ae0d8f6a6249041c47e
Este cometimento está contido em:
guanyu12
2023-12-18 10:27:02 +08:00
ascendente 5c53dd367d 498fde5cf4
cometimento 0662e8f08b
4 ficheiros modificados com 30 adições e 6 eliminações
+13 -1
Ver ficheiro
@@ -130,7 +130,7 @@ do_install_amdsmi_python_lib() {
# Remove old python library
local pip_list_output
pip_list_output=$(python3 -m pip list --disable-pip-version-check)
pip_list_output=$(python3 -m pip list --format=columns --disable-pip-version-check)
# check pip list output for amdsmi
if [[ $pip_list_output == *"amdsmi"* ]]; then
echo "Detected old AMD-SMI python library (amdsmi)..."
@@ -138,6 +138,18 @@ do_install_amdsmi_python_lib() {
echo "Removed old AMD-SMI python library (amdsmi)..."
fi
# upgrade pip if it's an ancient version
# otherwise the amdsmi install will fail
local pip_version
pip_version=$(python3 -m pip --version | grep -Eo '^[^\ ]+ ([0-9]+)' | grep -Eo '[0-9]+$')
if [[ "$pip_version" -lt 19 ]]; then
echo "Detected ancient pip version ($pip_version)... Upgrading..."
python3 -m pip install --upgrade pip --quiet --disable-pip-version-check
fi
unset pip_version
# install PyYAML dependency
python3 -m pip install 'PyYAML>=5.1' --quiet --disable-pip-version-check --ignore-installed
# install python library at @CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/amdsmi
local python_lib_path=@CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@
python3 -m pip install "$python_lib_path" --quiet --disable-pip-version-check
+2 -2
Ver ficheiro
@@ -61,13 +61,13 @@ rm_python_lib() {
# Remove old python library
local pip_list_output
pip_list_output=$(python3 -m pip list --disable-pip-version-check)
pip_list_output=$(python3 -m pip list --format=columns --disable-pip-version-check)
# check pip list output for amdsmi
if [[ $pip_list_output == *"amdsmi"* ]]; then
PIP_ROOT_USER_ACTION=ignore PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip uninstall amdsmi --yes --quiet --disable-pip-version-check
fi
pip_list_output=$(python3 -m pip list --disable-pip-version-check)
pip_list_output=$(python3 -m pip list --format=columns --disable-pip-version-check)
# check pip list output for amdsmi
if [[ $pip_list_output == *"amdsmi"* ]]; then
echo "[WARNING] AMD-SMI python library (amdsmi) is still installed in pip. "\
+13 -1
Ver ficheiro
@@ -129,7 +129,7 @@ do_install_amdsmi_python_lib() {
# Remove old python library
local pip_list_output
pip_list_output=$(python3 -m pip list --disable-pip-version-check)
pip_list_output=$(python3 -m pip list --format=columns --disable-pip-version-check)
# check pip list output for amdsmi
if [[ $pip_list_output == *"amdsmi"* ]]; then
echo "Detected old AMD-SMI python library (amdsmi)..."
@@ -137,6 +137,18 @@ do_install_amdsmi_python_lib() {
echo "Removed old AMD-SMI python library (amdsmi)..."
fi
# upgrade pip if it's an ancient version
# otherwise the amdsmi install will fail
local pip_version
pip_version=$(python3 -m pip --version | grep -Eo '^[^\ ]+ ([0-9]+)' | grep -Eo '[0-9]+$')
if [[ "$pip_version" -lt 19 ]]; then
echo "Detected ancient pip version ($pip_version)... Upgrading..."
python3 -m pip install --upgrade pip --quiet --disable-pip-version-check
fi
unset pip_version
# install PyYAML dependency
python3 -m pip install 'PyYAML>=5.1' --quiet --disable-pip-version-check --ignore-installed
# install python library at @CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/amdsmi
local python_lib_path=@CPACK_PACKAGING_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@
python3 -m pip install "$python_lib_path" --quiet --disable-pip-version-check
+2 -2
Ver ficheiro
@@ -53,13 +53,13 @@ rm_python_lib() {
# Remove old python library
local pip_list_output
pip_list_output=$(python3 -m pip list --disable-pip-version-check)
pip_list_output=$(python3 -m pip list --format=columns --disable-pip-version-check)
# check pip list output for amdsmi
if [[ $pip_list_output == *"amdsmi"* ]]; then
PIP_ROOT_USER_ACTION=ignore PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip uninstall amdsmi --yes --quiet --disable-pip-version-check
fi
pip_list_output=$(python3 -m pip list --disable-pip-version-check)
pip_list_output=$(python3 -m pip list --format=columns --disable-pip-version-check)
# check pip list output for amdsmi
if [[ $pip_list_output == *"amdsmi"* ]]; then
echo "[WARNING] AMD-SMI python library (amdsmi) is still installed in pip. "\