Skip to content

Commit 4231bae

Browse files
committed
Add --no-drm flag to nvidia installation for ubuntu24
1 parent 84fe969 commit 4231bae

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/nvidia_driver_ubuntu22+.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ def rebuild_initramfs?
2222
true
2323
end
2424

25+
def drm
26+
if node['platform_version'].to_i == 24
27+
'--no-drm'
28+
end
29+
end
30+
2531
def set_compiler?
2632
true
2733
end

cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/partial/_nvidia_driver_common.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
cwd '/tmp'
8080
code <<-NVIDIA
8181
set -e
82-
#{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau -m=#{nvidia_kernel_module}
82+
#{compiler_path} ./nvidia.run --silent --dkms #{drm}--disable-nouveau -m=#{nvidia_kernel_module}
8383
rm -f /tmp/nvidia.run
8484
NVIDIA
8585
creates '/usr/bin/nvidia-smi'
@@ -91,6 +91,10 @@
9191
end if rebuild_initramfs?
9292
end
9393

94+
def drm
95+
''
96+
end
97+
9498
def _nvidia_driver_version
9599
nvidia_driver_version || node['cluster']['nvidia']['driver_version']
96100
end

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ def self.setup(chef_run, nvidia_driver_version: nil)
249249
end
250250
end
251251

252+
drm = platform == 'ubuntu' && version == '24' ? '--no-drm' : ''
253+
252254
it 'installs nvidia driver' do
253255
is_expected.to run_bash('nvidia.run advanced')
254256
.with(
@@ -257,7 +259,7 @@ def self.setup(chef_run, nvidia_driver_version: nil)
257259
cwd: '/tmp',
258260
creates: '/usr/bin/nvidia-smi'
259261
)
260-
.with_code(%r{CC=/usr/bin/gcc10-gcc ./nvidia.run --silent --dkms --disable-nouveau -m=#{kernel_module}})
262+
.with_code(%r{CC=/usr/bin/gcc10-gcc ./nvidia.run --silent --dkms #{drm} --disable-nouveau -m=#{kernel_module}})
261263
.with_code(%r{rm -f /tmp/nvidia.run})
262264
end
263265
elsif platform == 'ubuntu' && version == '22.04'

0 commit comments

Comments
 (0)