Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ def rebuild_initramfs?
true
end

def drm
if node['platform_version'].to_i == 24
'--no-drm '
end
end

def set_compiler?
true
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
cwd '/tmp'
code <<-NVIDIA
set -e
#{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau -m=#{nvidia_kernel_module}
#{compiler_path} ./nvidia.run --silent --dkms --disable-nouveau -m=#{nvidia_kernel_module} --ui=none --no-questions
rm -f /tmp/nvidia.run
NVIDIA
creates '/usr/bin/nvidia-smi'
Expand All @@ -91,6 +91,10 @@
end if rebuild_initramfs?
end

def drm
''
end

def _nvidia_driver_version
nvidia_driver_version || node['cluster']['nvidia']['driver_version']
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ def self.setup(chef_run, nvidia_driver_version: nil)
end
end

drm = platform == 'ubuntu' && version == '24' ? '--no-drm' : ''

it 'installs nvidia driver' do
is_expected.to run_bash('nvidia.run advanced')
.with(
Expand All @@ -257,7 +259,7 @@ def self.setup(chef_run, nvidia_driver_version: nil)
cwd: '/tmp',
creates: '/usr/bin/nvidia-smi'
)
.with_code(%r{CC=/usr/bin/gcc10-gcc ./nvidia.run --silent --dkms --disable-nouveau -m=#{kernel_module}})
.with_code(%r{CC=/usr/bin/gcc10-gcc ./nvidia.run --silent --dkms #{drm} --disable-nouveau -m=#{kernel_module}})
.with_code(%r{rm -f /tmp/nvidia.run})
end
elsif platform == 'ubuntu' && version == '22.04'
Expand Down
Loading