This commit is contained in:
The Notorious F.O.X 2025-07-07 14:51:52 +02:00 committed by GitHub
commit 7c84c2972e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 59 additions and 34 deletions

View file

@ -267,31 +267,34 @@ get_supported_versions () {
} }
patch_common () { patch_common () {
NVIDIA_SMI="$(command -v nvidia-smi || true)"
if [[ ! "$NVIDIA_SMI" ]] ; then
echo 'nvidia-smi utility not found. Probably driver is not installed.'
exit 1
fi
if [[ "$manual_driver_version" ]]; then if [[ "$manual_driver_version" ]]; then
driver_version="$manual_driver_version" driver_version="$manual_driver_version"
echo "Using manually entered nvidia driver version: $driver_version" echo "Using manually entered nvidia driver version: $driver_version"
else else
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits" # Try to detect nvidia-smi, but don't exit if it's not found
driver_versions_list=$($cmd) || ( NVIDIA_SMI="$(command -v nvidia-smi || true)"
ret_code=$?
echo "Can not detect nvidia driver version." if [[ ! "$NVIDIA_SMI" ]] ; then
echo "CMD: \"$cmd\"" echo 'nvidia-smi utility not found. Probably driver is not installed.'
echo "Result: \"$driver_versions_list\""
echo "nvidia-smi retcode: $ret_code"
exit 1 exit 1
) else
driver_version=$(echo "$driver_versions_list" | head -n 1) cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
driver_versions_list=$($cmd) || (
ret_code=$?
echo "Can not detect nvidia driver version."
echo "CMD: \"$cmd\""
echo "Result: \"$driver_versions_list\""
echo "nvidia-smi retcode: $ret_code"
exit 1
)
driver_version=$(echo "$driver_versions_list" | head -n 1)
echo "Detected nvidia driver version: $driver_version" echo "Detected nvidia driver version: $driver_version"
fi
fi fi
if ! check_version_supported "$driver_version" ; then if ! check_version_supported "$driver_version" ; then
echo "Patch for this ($driver_version) nvidia driver not found." echo "Patch for this ($driver_version) nvidia driver not found."
echo "Patch is available for versions: " echo "Patch is available for versions: "

View file

@ -305,30 +305,52 @@ get_supported_versions () {
} }
patch_common () { patch_common () {
if [[ "$manual_driver_version" ]]; then
driver_version="$manual_driver_version"
<<<<<<< HEAD
echo "Using manually entered nvidia driver version: $driver_version"
=======
echo "Using manually entered Nvidia driver version: $driver_version"
else
NVIDIA_SMI="$(command -v nvidia-smi || true)" NVIDIA_SMI="$(command -v nvidia-smi || true)"
if [[ ! "$NVIDIA_SMI" ]] ; then if [[ ! "$NVIDIA_SMI" ]] ; then
echo 'nvidia-smi utility not found. Probably driver is not installed.' echo 'nvidia-smi utility not found. Probably driver is not installed.'
exit 1 exit 1
fi
>>>>>>> parent of ff838cf (Update patch.sh)
if [[ "$manual_driver_version" ]]; then
driver_version="$manual_driver_version"
echo "Using manually entered nvidia driver version: $driver_version"
else else
cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits" # Try to detect nvidia-smi, but don't exit if it's not found
driver_versions_list=$($cmd) || ( NVIDIA_SMI="$(command -v nvidia-smi || true)"
ret_code=$?
echo "Can not detect nvidia driver version." if [[ ! "$NVIDIA_SMI" ]] ; then
echo "CMD: \"$cmd\"" echo 'nvidia-smi utility not found. Probably driver is not installed.'
echo "Result: \"$driver_versions_list\""
echo "nvidia-smi retcode: $ret_code"
exit 1 exit 1
) else
driver_version=$(echo "$driver_versions_list" | head -n 1) cmd="$NVIDIA_SMI --query-gpu=driver_version --format=csv,noheader,nounits"
driver_versions_list=$($cmd) || (
ret_code=$?
echo "Can not detect nvidia driver version."
echo "CMD: \"$cmd\""
echo "Result: \"$driver_versions_list\""
echo "nvidia-smi retcode: $ret_code"
exit 1
)
driver_version=$(echo "$driver_versions_list" | head -n 1)
echo "Detected nvidia driver version: $driver_version" <<<<<<< HEAD
echo "Detected nvidia driver version: $driver_version"
fi
fi fi
=======
echo "Detected nvidia driver version: $driver_version"
fi
>>>>>>> parent of ff838cf (Update patch.sh)
if ! check_version_supported "$driver_version" ; then if ! check_version_supported "$driver_version" ; then
echo "Patch for this ($driver_version) nvidia driver not found." echo "Patch for this ($driver_version) nvidia driver not found."
@ -376,9 +398,9 @@ patch_common () {
done done
[[ "$dir_found" ]] || { echo "ERROR: cannot detect driver directory"; exit 1; } [[ "$dir_found" ]] || { echo "ERROR: cannot detect driver directory"; exit 1; }
} }
ensure_bytes_are_valid () { ensure_bytes_are_valid () {
driver_file="$driver_dir/$object.$driver_version" driver_file="$driver_dir/$object.$driver_version"
original_bytes=$(awk -F / '$2 { print $2 }' <<< "$patch") original_bytes=$(awk -F / '$2 { print $2 }' <<< "$patch")