Skip to content

Commit a919dd8

Browse files
shivakunvshivakunv
committed
Add R580 support for precompiled driver
Signed-off-by: Shiva Kumar (SW-CLOUD) <[email protected]>
1 parent cef2e59 commit a919dd8

File tree

7 files changed

+97
-37
lines changed

7 files changed

+97
-37
lines changed

‎.common-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ trigger-pipeline:
9999
.driver-versions-precompiled-ubuntu22.04:
100100
parallel:
101101
matrix:
102-
- DRIVER_BRANCH: [535, 570]
102+
- DRIVER_BRANCH: [535, 570, 580]
103103
KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
104104
LTS_KERNEL: ["5.15", "6.8"]
105105

106106
# Define the matrix of precompiled jobs that can be run in parallel for ubuntu24.04
107107
.driver-versions-precompiled-ubuntu24.04:
108108
parallel:
109109
matrix:
110-
- DRIVER_BRANCH: [570]
110+
- DRIVER_BRANCH: [570, 580]
111111
KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
112112
LTS_KERNEL: ["6.8"]
113113

‎.github/workflows/image.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jobs:
107107
driver:
108108
- 535
109109
- 570
110+
- 580
110111
flavor:
111112
- aws
112113
- azure

‎.github/workflows/precompiled.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
id: extract_driver_branch
3535
run: |
3636
# get driver_branch
37-
DRIVER_BRANCH=("535" "570")
37+
DRIVER_BRANCH=("535" "570" "580")
3838
driver_branch_json=$(printf '%s\n' "${DRIVER_BRANCH[@]}" | jq -R . | jq -cs .)
3939
echo "driver_branch=$driver_branch_json" >> $GITHUB_OUTPUT
4040

‎ubuntu22.04/precompiled/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ RUN if [ -n "${CVE_UPDATES}" ]; then \
5151
rm -rf /var/lib/apt/lists/*; \
5252
fi
5353

54-
RUN if [ "$DRIVER_BRANCH" -ge "550" ]; then \
55-
apt-get update && \
56-
apt-get install -y --no-install-recommends nvidia-imex-${DRIVER_BRANCH}=${DRIVER_VERSION}-1 && \
57-
rm -rf /var/lib/apt/lists/*; fi
58-
5954
COPY nvidia-driver /usr/local/bin
6055

6156
ADD local-repo.sh /tmp

‎ubuntu22.04/precompiled/local-repo.sh‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,48 @@ download_apt_with_dep () {
2222
fi
2323
}
2424

25+
nvlink5_pkgs_download() {
26+
if [ "$DRIVER_BRANCH" -ge "570" ]; then
27+
download_apt_with_dep nvlsm
28+
download_apt_with_dep infiniband-diags
29+
fi
30+
}
31+
32+
# libnvsdm packages are not available for arm64
33+
nvsdm_download() {
34+
if [ "$TARGETARCH" = "amd64" ]; then
35+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
36+
download_apt_with_dep libnvsdm=${DRIVER_VERSION}-1
37+
elif [ "$DRIVER_BRANCH" -ge "570" ]; then
38+
download_apt_with_dep libnvsdm-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
39+
fi
40+
fi
41+
}
42+
43+
fabricmanager_download() {
44+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
45+
download_apt_with_dep nvidia-fabricmanager=${DRIVER_VERSION}-1
46+
else
47+
download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
48+
fi
49+
}
50+
51+
nscq_download() {
52+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
53+
download_apt_with_dep libnvidia-nscq=${DRIVER_VERSION}-1
54+
else
55+
download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
56+
fi
57+
}
58+
59+
imex_download() {
60+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
61+
download_apt_with_dep nvidia-imex=${DRIVER_VERSION}-1
62+
elif [ "$DRIVER_BRANCH" -ge "570" ]; then
63+
download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
64+
fi
65+
}
66+
2567
download_driver_package_deps () {
2668
apt-get update
2769
pushd ${LOCAL_REPO_DIR}
@@ -37,18 +79,11 @@ download_driver_package_deps () {
3779
download_apt_with_dep libnvidia-encode-${DRIVER_BRANCH}-server
3880
download_apt_with_dep libnvidia-fbc1-${DRIVER_BRANCH}-server
3981

40-
download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
41-
download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
42-
43-
if [ "$DRIVER_BRANCH" -ge "550" ]; then
44-
download_apt_with_dep nvlsm
45-
download_apt_with_dep infiniband-diags
46-
download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
47-
fi
48-
49-
if [ "$DRIVER_BRANCH" -ge "560" ]; then
50-
download_apt_with_dep libnvsdm-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
51-
fi
82+
fabricmanager_download
83+
nscq_download
84+
nvlink5_pkgs_download
85+
imex_download
86+
nvsdm_download
5287

5388
ls -al .
5489
popd

‎ubuntu24.04/precompiled/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ RUN if [ -n "${CVE_UPDATES}" ]; then \
4646
rm -rf /var/lib/apt/lists/*; \
4747
fi
4848

49-
RUN if [ "$DRIVER_BRANCH" -ge "550" ]; then \
50-
apt-get update && \
51-
apt-get install -y --no-install-recommends nvidia-imex-${DRIVER_BRANCH}=${DRIVER_VERSION}-1 && \
52-
rm -rf /var/lib/apt/lists/*; fi
53-
5449
COPY nvidia-driver /usr/local/bin
5550

5651
ADD local-repo.sh /tmp

‎ubuntu24.04/precompiled/local-repo.sh‎

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,47 @@ download_apt_with_dep () {
2222
fi
2323
}
2424

25+
nvlink5_pkgs_download() {
26+
if [ "$DRIVER_BRANCH" -ge "550" ]; then
27+
download_apt_with_dep nvlsm
28+
download_apt_with_dep infiniband-diags
29+
fi
30+
}
31+
32+
nvsdm_download() {
33+
if [ "$TARGETARCH" = "amd64" ]; then
34+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
35+
download_apt_with_dep libnvsdm=${DRIVER_VERSION}-1
36+
elif [ "$DRIVER_BRANCH" -ge "570" ]; then
37+
download_apt_with_dep libnvsdm-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
38+
fi
39+
fi
40+
}
41+
42+
fabricmanager_download() {
43+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
44+
download_apt_with_dep nvidia-fabricmanager=${DRIVER_VERSION}-1
45+
else
46+
download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
47+
fi
48+
}
49+
50+
nscq_download() {
51+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
52+
download_apt_with_dep libnvidia-nscq=${DRIVER_VERSION}-1
53+
else
54+
download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
55+
fi
56+
}
57+
58+
imex_download() {
59+
if [ "$DRIVER_BRANCH" -ge "580" ]; then
60+
download_apt_with_dep nvidia-imex=${DRIVER_VERSION}-1
61+
elif [ "$DRIVER_BRANCH" -ge "570" ]; then
62+
download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
63+
fi
64+
}
65+
2566
download_driver_package_deps () {
2667
apt-get update
2768
pushd ${LOCAL_REPO_DIR}
@@ -37,18 +78,11 @@ download_driver_package_deps () {
3778
download_apt_with_dep libnvidia-encode-${DRIVER_BRANCH}-server
3879
download_apt_with_dep libnvidia-fbc1-${DRIVER_BRANCH}-server
3980

40-
download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
41-
download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
42-
43-
if [ "$DRIVER_BRANCH" -ge "550" ]; then
44-
download_apt_with_dep nvlsm
45-
download_apt_with_dep infiniband-diags
46-
download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
47-
fi
48-
49-
if [ "$DRIVER_BRANCH" -ge "560" ]; then
50-
download_apt_with_dep libnvsdm-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
51-
fi
81+
fabricmanager_download
82+
nscq_download
83+
nvlink5_pkgs_download
84+
imex_download
85+
nvsdm_download
5286

5387
ls -al .
5488
popd

0 commit comments

Comments
 (0)