Skip to content

Commit 4bdeb3e

Browse files
authored
Improve capture-hw-details.sh for Windows (#3490)
Fixes #3277.
1 parent c5179c8 commit 4bdeb3e

File tree

1 file changed

+49
-23
lines changed

1 file changed

+49
-23
lines changed

scripts/capture-hw-details.sh

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,55 @@ for arg in "$@"; do
1818
esac
1919
done
2020

21-
if dpkg-query --show libigc2 &> /dev/null; then
22-
export LIBIGC1_VERSION=$(dpkg-query --show --showformat='${version}\n' libigc2 | grep -oP '.+(?=~)')
23-
elif dpkg-query --show libigc1 &> /dev/null; then
24-
export LIBIGC1_VERSION=$(dpkg-query --show --showformat='${version}\n' libigc1 | grep -oP '.+(?=~)')
25-
else
26-
export LIBIGC1_VERSION="Not Installed"
27-
fi
21+
function libigc_version {
22+
if [[ $OSTYPE = msys ]]; then
23+
powershell -Command "(Get-ChildItem c:/Windows/System32/DriverStore/FileRepository/*/igc64.dll).VersionInfo.ProductVersion"
24+
return
25+
fi
26+
if dpkg-query --show libigc2 &> /dev/null; then
27+
dpkg-query --show --showformat='${version}\n' libigc2 | grep -oP '.+(?=~)'
28+
elif dpkg-query --show libigc1 &> /dev/null; then
29+
dpkg-query --show --showformat='${version}\n' libigc1 | grep -oP '.+(?=~)'
30+
else
31+
echo "Not Installed"
32+
fi
33+
}
2834

29-
if dpkg-query --show libze1 &> /dev/null; then
30-
export LEVEL_ZERO_VERSION=$(dpkg-query --show --showformat='${version}\n' libze1 | grep -oP '.+(?=~)')
31-
elif dpkg-query --show intel-level-zero-gpu &> /dev/null; then
32-
export LEVEL_ZERO_VERSION=$(dpkg-query --show --showformat='${version}\n' intel-level-zero-gpu | grep -oP '.+(?=~)')
33-
else
34-
export LEVEL_ZERO_VERSION="Not Installed"
35-
fi
35+
function level_zero_version {
36+
if [[ $OSTYPE = msys ]]; then
37+
powershell -Command "(Get-Item C:\Windows\system32\ze_loader.dll).VersionInfo.ProductVersion"
38+
return
39+
fi
40+
if dpkg-query --show libze1 &> /dev/null; then
41+
dpkg-query --show --showformat='${version}\n' libze1 | grep -oP '.+(?=~)'
42+
elif dpkg-query --show intel-level-zero-gpu &> /dev/null; then
43+
dpkg-query --show --showformat='${version}\n' intel-level-zero-gpu | grep -oP '.+(?=~)'
44+
else
45+
echo "Not Installed"
46+
fi
47+
}
3648

37-
if dpkg-query --show libigc2 &> /dev/null; then
38-
export AGAMA_VERSION=$(dpkg-query --show --showformat='${version}\n' libigc2 | sed 's/.*-\(.*\)~.*/\1/')
39-
elif dpkg-query --show libigc1 &> /dev/null; then
40-
export AGAMA_VERSION=$(dpkg-query --show --showformat='${version}\n' libigc1 | sed 's/.*-\(.*\)~.*/\1/')
41-
else
42-
export AGAMA_VERSION="Not Installed"
43-
fi
49+
function agama_version {
50+
if [[ $OSTYPE = msys ]]; then
51+
powershell -Command '(Get-WmiObject Win32_VideoController | where {$_.VideoProcessor -like "*Intel*" }).DriverVersion'
52+
return
53+
fi
54+
if dpkg-query --show libigc2 &> /dev/null; then
55+
dpkg-query --show --showformat='${version}\n' libigc2 | sed 's/.*-\(.*\)~.*/\1/'
56+
elif dpkg-query --show libigc1 &> /dev/null; then
57+
dpkg-query --show --showformat='${version}\n' libigc1 | sed 's/.*-\(.*\)~.*/\1/'
58+
else
59+
echo "Not Installed"
60+
fi
61+
}
62+
63+
# Use LIBIGC1_VERSION also for libigc2 for backward compatibility.
64+
export LIBIGC1_VERSION="$(libigc_version)"
65+
66+
export LEVEL_ZERO_VERSION="$(level_zero_version)"
67+
68+
# Use AGAMA_VERSION for GPU driver version on both Linux and Windows for backward compatibility.
69+
export AGAMA_VERSION="$(agama_version)"
4470

4571
if command -v clinfo &> /dev/null; then
4672
export GPU_DEVICE=$(clinfo --json | jq -r '[.devices[].online[] | select(.CL_DEVICE_TYPE.raw == 4)][0].CL_DEVICE_NAME')
@@ -64,14 +90,14 @@ else
6490
export COMPILER_VERSION="Not installed"
6591
fi
6692

67-
if [ "$QUIET" = false ]; then
93+
if [[ $QUIET = false ]]; then
6894
echo "LIBIGC1_VERSION=$LIBIGC1_VERSION"
6995
echo "LEVEL_ZERO_VERSION=$LEVEL_ZERO_VERSION"
7096
echo "AGAMA_VERSION=$AGAMA_VERSION"
7197
echo "GPU_DEVICE=$GPU_DEVICE"
7298
echo "TORCH_VERSION=$TORCH_VERSION"
7399
echo "COMPILER_VERSION=$COMPILER_VERSION"
74-
if [[ ! "${BENCHMARKING_METHOD:-}" = "" ]]; then
100+
if [[ ${BENCHMARKING_METHOD:-} ]]; then
75101
echo "BENCHMARKING_METHOD=$BENCHMARKING_METHOD"
76102
fi
77103
fi

0 commit comments

Comments
 (0)