Skip to content

Commit 8d868ef

Browse files
tariq1890tariq1890
authored
Merge pull request #283 from NVIDIA/revert-backcompat-openrm-var
2 parents 95538d8 + 8ea8692 commit 8d868ef

File tree

4 files changed

+4
-40
lines changed

4 files changed

+4
-40
lines changed

‎rhel8/nvidia-driver‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ USE_HOST_MOFED="${USE_HOST_MOFED:-false}"
1717
DNF_RELEASEVER=${DNF_RELEASEVER:-""}
1818
RHEL_VERSION=${RHEL_VERSION:-""}
1919
RHEL_MAJOR_VERSION=8
20-
21-
OPEN_KERNEL_MODULES_ENABLED=${OPEN_KERNEL_MODULES_ENABLED:-}
22-
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-}
20+
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-auto}
2321

2422
DRIVER_ARCH=${TARGETARCH/amd64/x86_64} && DRIVER_ARCH=${DRIVER_ARCH/arm64/aarch64}
2523
echo "DRIVER_ARCH is $DRIVER_ARCH"
@@ -600,13 +598,6 @@ _shutdown() {
600598
# to install. Valid values for KERNEL_MODULE_TYPE are 'auto' (default), 'open', and 'proprietary'.
601599
# When 'auto' is configured, we use the nvidia-installer to recommend the module type to install.
602600
_resolve_kernel_type() {
603-
# For backwards compatibility with older GPU Operator versions where KERNEL_MODULE_TYPE is not set,
604-
# honor the deprecated OPEN_KERNEL_MODULES_ENABLED field
605-
if [ -z "${KERNEL_MODULE_TYPE}" ]; then
606-
[[ "${OPEN_KERNEL_MODULES_ENABLED}" == "true" ]] && KERNEL_TYPE=kernel-open || KERNEL_TYPE=kernel
607-
return 0
608-
fi
609-
610601
if [ "${KERNEL_MODULE_TYPE}" == "proprietary" ]; then
611602
KERNEL_TYPE=kernel
612603
elif [ "${KERNEL_MODULE_TYPE}" == "open" ]; then

‎rhel9/nvidia-driver‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ USE_HOST_MOFED="${USE_HOST_MOFED:-false}"
1717
DNF_RELEASEVER=${DNF_RELEASEVER:-""}
1818
RHEL_VERSION=${RHEL_VERSION:-""}
1919
RHEL_MAJOR_VERSION=9
20-
21-
OPEN_KERNEL_MODULES_ENABLED=${OPEN_KERNEL_MODULES_ENABLED:-}
22-
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-}
20+
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-auto}
2321

2422
DRIVER_ARCH=${TARGETARCH/amd64/x86_64} && DRIVER_ARCH=${DRIVER_ARCH/arm64/aarch64}
2523
echo "DRIVER_ARCH is $DRIVER_ARCH"
@@ -600,13 +598,6 @@ _shutdown() {
600598
# to install. Valid values for KERNEL_MODULE_TYPE are 'auto' (default), 'open', and 'proprietary'.
601599
# When 'auto' is configured, we use the nvidia-installer to recommend the module type to install.
602600
_resolve_kernel_type() {
603-
# For backwards compatibility with older GPU Operator versions where KERNEL_MODULE_TYPE is not set,
604-
# honor the deprecated OPEN_KERNEL_MODULES_ENABLED field
605-
if [ -z "${KERNEL_MODULE_TYPE}" ]; then
606-
[[ "${OPEN_KERNEL_MODULES_ENABLED}" == "true" ]] && KERNEL_TYPE=kernel-open || KERNEL_TYPE=kernel
607-
return 0
608-
fi
609-
610601
if [ "${KERNEL_MODULE_TYPE}" == "proprietary" ]; then
611602
KERNEL_TYPE=kernel
612603
elif [ "${KERNEL_MODULE_TYPE}" == "open" ]; then

‎ubuntu20.04/nvidia-driver‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ NVIDIA_UVM_MODULE_PARAMS=()
1515
NVIDIA_MODESET_MODULE_PARAMS=()
1616
NVIDIA_PEERMEM_MODULE_PARAMS=()
1717
TARGETARCH=${TARGETARCH:?"Missing TARGETARCH env"}
18-
19-
OPEN_KERNEL_MODULES_ENABLED=${OPEN_KERNEL_MODULES_ENABLED:-}
20-
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-}
18+
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-auto}
2119

2220
export DEBIAN_FRONTEND=noninteractive
2321

@@ -485,13 +483,6 @@ _shutdown() {
485483
# to install. Valid values for KERNEL_MODULE_TYPE are 'auto' (default), 'open', and 'proprietary'.
486484
# When 'auto' is configured, we use the nvidia-installer to recommend the module type to install.
487485
_resolve_kernel_type() {
488-
# For backwards compatibility with older GPU Operator versions where KERNEL_MODULE_TYPE is not set,
489-
# honor the deprecated OPEN_KERNEL_MODULES_ENABLED field
490-
if [ -z "${KERNEL_MODULE_TYPE}" ]; then
491-
[[ "${OPEN_KERNEL_MODULES_ENABLED}" == "true" ]] && KERNEL_TYPE=kernel-open || KERNEL_TYPE=kernel
492-
return 0
493-
fi
494-
495486
if [ "${KERNEL_MODULE_TYPE}" == "proprietary" ]; then
496487
KERNEL_TYPE=kernel
497488
elif [ "${KERNEL_MODULE_TYPE}" == "open" ]; then

‎ubuntu22.04/nvidia-driver‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ NVIDIA_UVM_MODULE_PARAMS=()
1515
NVIDIA_MODESET_MODULE_PARAMS=()
1616
NVIDIA_PEERMEM_MODULE_PARAMS=()
1717
TARGETARCH=${TARGETARCH:?"Missing TARGETARCH env"}
18-
19-
OPEN_KERNEL_MODULES_ENABLED=${OPEN_KERNEL_MODULES_ENABLED:-}
20-
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-}
18+
KERNEL_MODULE_TYPE=${KERNEL_MODULE_TYPE:-auto}
2119

2220
export DEBIAN_FRONTEND=noninteractive
2321

@@ -540,13 +538,6 @@ _shutdown() {
540538
# to install. Valid values for KERNEL_MODULE_TYPE are 'auto' (default), 'open', and 'proprietary'.
541539
# When 'auto' is configured, we use the nvidia-installer to recommend the module type to install.
542540
_resolve_kernel_type() {
543-
# For backwards compatibility with older GPU Operator versions where KERNEL_MODULE_TYPE is not set,
544-
# honor the deprecated OPEN_KERNEL_MODULES_ENABLED field
545-
if [ -z "${KERNEL_MODULE_TYPE}" ]; then
546-
[[ "${OPEN_KERNEL_MODULES_ENABLED}" == "true" ]] && KERNEL_TYPE=kernel-open || KERNEL_TYPE=kernel
547-
return 0
548-
fi
549-
550541
if [ "${KERNEL_MODULE_TYPE}" == "proprietary" ]; then
551542
KERNEL_TYPE=kernel
552543
elif [ "${KERNEL_MODULE_TYPE}" == "open" ]; then

0 commit comments

Comments
 (0)