Skip to content

Commit 2ca5732

Browse files
author
Himani Anil Deshpande
committed
[NVIDIA-IMEX] USe specific Version naming for nvidia-imex installation
1 parent f9a2c4c commit 2ca5732

File tree

6 files changed

+31
-4
lines changed

6 files changed

+31
-4
lines changed

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_alinux2023.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@
1717
end
1818

1919
use 'partial/_nvidia_imex_common.rb'
20+
21+
def _nvidia_imex_version
22+
nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
23+
"#{nvidia_major_version}-#{node['cluster']['nvidia']['driver_version']}-1"
24+
end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_redhat8.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@
1717
end
1818

1919
use 'partial/_nvidia_imex_common.rb'
20+
21+
def _nvidia_imex_version
22+
nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
23+
"#{nvidia_major_version}-#{node['cluster']['nvidia']['driver_version']}-1"
24+
end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_rocky8.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@
1717
end
1818

1919
use 'partial/_nvidia_imex_common.rb'
20+
21+
def _nvidia_imex_version
22+
nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
23+
"#{nvidia_major_version}-#{node['cluster']['nvidia']['driver_version']}-1"
24+
end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_ubuntu22+.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@
1717
end
1818

1919
use 'partial/_nvidia_imex_common.rb'
20+
21+
def _nvidia_imex_version
22+
nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
23+
"#{nvidia_major_version}_#{node['cluster']['nvidia']['driver_version']}-1"
24+
end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/partial/_nvidia_imex_common.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
package 'nvidia-imex' do
5252
retries 3
5353
retry_delay 5
54-
version node['cluster']['nvidia']['driver_version']
54+
version _nvidia_imex_version
5555
end
5656
end
5757

cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_imex_spec.rb

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper'
22

33
shared_dir = "SHARED_DIR"
4-
nvidia_version = "NVIDIA_VERSION"
4+
nvidia_version = "1.2.3"
55
nvidia_imex_shared_dir = "#{shared_dir}/nvidia-imex"
66
imex_binary = '/usr/bin/nvidia-imex'
77
imex_ctl_binary = '/usr/bin/nvidia-imex-ctl'
@@ -169,6 +169,13 @@ def self.install(chef_run)
169169
end
170170
runner(platform: platform, version: version, step_into: ['nvidia_imex'])
171171
end
172+
cached(:nvidia_imex_version) do
173+
if %(redhat rocky).include?(platform) || platform == 'amazon' && version == '2023'
174+
"1-1.2.3-1"
175+
else
176+
"1_1.2.3-1"
177+
end
178+
end
172179

173180
before do
174181
chef_run.node.override['cluster']['shared_dir'] = shared_dir
@@ -199,7 +206,7 @@ def self.install(chef_run)
199206
is_expected.not_to install_package('nvidia-imex')
200207
.with(retries: 3)
201208
.with(retry_delay: 5)
202-
.with(version: nvidia_version)
209+
.with(version: nvidia_imex_version)
203210
end
204211
else
205212
it 'installs nvidia-imex' do
@@ -224,7 +231,7 @@ def self.install(chef_run)
224231
is_expected.to install_package('nvidia-imex')
225232
.with(retries: 3)
226233
.with(retry_delay: 5)
227-
.with(version: nvidia_version)
234+
.with(version: nvidia_imex_version)
228235
end
229236
end
230237
end

0 commit comments

Comments
 (0)