Skip to content

Commit 52ecdde

Browse files
committed
GPU tests: remove deprecated centos7 setup logic
1 parent 19ec7da commit 52ecdde

File tree

3 files changed

+18
-84
lines changed
  • integration_test/third_party_apps_test/applications

3 files changed

+18
-84
lines changed

integration_test/third_party_apps_test/applications/dcgm/centos_rhel/install

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -97,37 +97,15 @@ try_install() {
9797
return 1
9898
}
9999

100-
handle_rhel7() {
101-
install_driver_package() {
102-
# Ref: https://docs.nvidia.com/datacenter/tesla/tesla-installation-notes/index.html#centos7
103-
# For Centos - we can expect the repo to have the matching version of
104-
# kernel packages, and the driver package needs those kernel packages
105-
sudo yum install -y kernel-devel-$(uname -r) kernel-headers-$(uname -r)
106-
sudo yum -y install nvidia-driver-latest-dkms
107-
}
108-
109-
remove_driver_package() {
110-
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
111-
sudo yum -y remove "*nvidia*"
112-
}
100+
install_driver_package() {
101+
# Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
102+
sudo yum -y module install nvidia-driver
113103
}
114104

115-
handle_common() {
116-
install_driver_package() {
117-
# Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
118-
sudo yum -y module install nvidia-driver
119-
}
120-
121-
remove_driver_package() {
122-
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
123-
sudo yum -y module remove --all nvidia-driver
124-
}
125-
105+
remove_driver_package() {
106+
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
107+
sudo yum -y module remove --all nvidia-driver
126108
}
127109

128-
case "$MAJOR_VERSION_ID" in
129-
7) handle_rhel7;;
130-
*) handle_common;;
131-
esac
132110
try_install install_cuda_from_package_manager install_cuda_from_runfile
133111
install_dcgm

integration_test/third_party_apps_test/applications/dcgmv1/centos_rhel/install

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -97,37 +97,15 @@ try_install() {
9797
return 1
9898
}
9999

100-
handle_rhel7() {
101-
install_driver_package() {
102-
# Ref: https://docs.nvidia.com/datacenter/tesla/tesla-installation-notes/index.html#centos7
103-
# For Centos - we can expect the repo to have the matching version of
104-
# kernel packages, and the driver package needs those kernel packages
105-
sudo yum install -y kernel-devel-$(uname -r) kernel-headers-$(uname -r)
106-
sudo yum -y install nvidia-driver-latest-dkms
107-
}
108-
109-
remove_driver_package() {
110-
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
111-
sudo yum -y remove "*nvidia*"
112-
}
100+
install_driver_package() {
101+
# Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
102+
sudo yum -y module install nvidia-driver
113103
}
114104

115-
handle_common() {
116-
install_driver_package() {
117-
# Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
118-
sudo yum -y module install nvidia-driver
119-
}
120-
121-
remove_driver_package() {
122-
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
123-
sudo yum -y module remove --all nvidia-driver
124-
}
125-
105+
remove_driver_package() {
106+
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
107+
sudo yum -y module remove --all nvidia-driver
126108
}
127109

128-
case "$MAJOR_VERSION_ID" in
129-
7) handle_rhel7;;
130-
*) handle_common;;
131-
esac
132110
try_install install_cuda_from_package_manager install_cuda_from_runfile
133111
install_dcgm

integration_test/third_party_apps_test/applications/nvml/centos_rhel/install

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -87,36 +87,14 @@ try_install() {
8787
return 1
8888
}
8989

90-
handle_rhel7() {
91-
install_driver_package() {
92-
# Ref: https://docs.nvidia.com/datacenter/tesla/tesla-installation-notes/index.html#centos7
93-
# For Centos - we can expect the repo to have the matching version of
94-
# kernel packages, and the driver package needs those kernel packages
95-
sudo yum install -y kernel-devel-$(uname -r) kernel-headers-$(uname -r)
96-
sudo yum -y install nvidia-driver-latest-dkms
97-
}
98-
99-
remove_driver_package() {
100-
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
101-
sudo yum -y remove "*nvidia*"
102-
}
90+
install_driver_package() {
91+
# Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
92+
sudo yum -y module install nvidia-driver
10393
}
10494

105-
handle_common() {
106-
install_driver_package() {
107-
# Ref: https://developer.nvidia.com/cuda-12-2-2-download-archive?target_os=Linux&target_arch=x86_64&Distribution=RHEL&target_version=8&target_type=rpm_network
108-
sudo yum -y module install nvidia-driver
109-
}
110-
111-
remove_driver_package() {
112-
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
113-
sudo yum -y module remove --all nvidia-driver
114-
}
115-
95+
remove_driver_package() {
96+
# Ref: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#removing-cuda-toolkit-and-driver
97+
sudo yum -y module remove --all nvidia-driver
11698
}
11799

118-
case "$MAJOR_VERSION_ID" in
119-
7) handle_rhel7;;
120-
*) handle_common;;
121-
esac
122100
try_install install_cuda_from_package_manager install_cuda_from_runfile

0 commit comments

Comments
 (0)