Skip to content

Add NVSwitch device ID for p6 instance type #2987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2025
Merged
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 @@ -54,10 +54,12 @@ def _nvidia_driver_version

# Get number of nv switches
def get_nvswitches
Copy link
Contributor

@gmarciani gmarciani Jul 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we cover this change within the fabric manager spec test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will try to see if I can for this function as a Unit test

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the unit test!

# A100 (P4) and H100(P5) systems have NVSwitches
# A100 (P4), H100(P5) and B200(P6) systems have NVSwitches
# NVSwitch device id is 10de:1af1 for P4 instance
# NVSwitch device id is 10de:22a3 for P5 instance
nvswitch_check_p4 = shell_out("lspci -d 10de:1af1 | wc -l")
nvswitch_check_p5 = shell_out("lspci -d 10de:22a3 | wc -l")
nvswitch_check_p4.stdout.strip.to_i + nvswitch_check_p5.stdout.strip.to_i
# NVSwitch device id is 10de:2901 for P6 instance
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did we take the device id 10de:2901 from?
Is there some public reference that we can link to the PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# We sum the count for all these deviceIds as output of lscpi command will be >0
# for only one device ID based on the instance type
nvswitch_device_ids = ['10de:1af1', '10de:22a3', '10de:2901']
nvswitch_device_ids.sum { |id| shell_out("lspci -d #{id} | wc -l").stdout.strip.to_i }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we summing up all the number of switches rather than returning the specific number for the specific instance type?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These device Id's are based on the GPU being used, and the solution is irrespective of the instance type as we use device ID of GPU's for which we know have NVswitches

end
Original file line number Diff line number Diff line change
Expand Up @@ -260,3 +260,40 @@ def self.configure(chef_run)
end
end
end

describe 'fabric_manager:get_nvswitches' do
cached(:chef_run) do
ChefSpec::SoloRunner.new(step_into: ['fabric_manager'])
end

let(:output_of_shell) { double('shell_out') }
cached(:resource) do
ConvergeFabricManager.setup(chef_run)
chef_run.find_resource('fabric_manager', 'setup')
end

before do
allow(resource).to receive(:shell_out).and_return(output_of_shell)
end

context 'when count of NVSwitches > 1' do
it 'correctly counts multiple NVSwitches' do
allow(output_of_shell).to receive(:stdout).and_return("2\n", "0\n", "0\n")
expect(resource.get_nvswitches).to eq(2)
end
end

context 'when count of NVSwitches == 0' do
it 'returns zero when no NVSwitches are found' do
allow(output_of_shell).to receive(:stdout).and_return("0\n")
expect(resource.get_nvswitches).to eq(0)
end
end

context 'when count of NVSwitches gives unexpected output' do
it 'handles non-numeric output' do
allow(output_of_shell).to receive(:stdout).and_return("error\n")
expect(resource.get_nvswitches).to eq(0)
end
end
end
Loading