From bc8b25fe7b87efaf783e93047745f2c462f09147 Mon Sep 17 00:00:00 2001 From: songwenping Date: Sat, 10 Sep 2022 09:04:21 +0800 Subject: [PATCH] Fix the compatible issue Change-Id: I9b837d96018c5a3b01af0326c3b720a26fbdc157 --- cyborg/accelerator/drivers/fpga/inspur/sysinfo.py | 2 +- cyborg/accelerator/drivers/fpga/xilinx/sysinfo.py | 2 +- cyborg/accelerator/drivers/gpu/utils.py | 2 +- cyborg/accelerator/drivers/ssd/utils.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cyborg/accelerator/drivers/fpga/inspur/sysinfo.py b/cyborg/accelerator/drivers/fpga/inspur/sysinfo.py index b1e807b3..52f9ae62 100644 --- a/cyborg/accelerator/drivers/fpga/inspur/sysinfo.py +++ b/cyborg/accelerator/drivers/fpga/inspur/sysinfo.py @@ -128,7 +128,7 @@ def _generate_dep_list(fpga): # once cyborg needs to support Inspur FPGA devices discovered from a # baremetal node, we might need to support more formats. driver_dep.name = CONF.host + '_' + fpga["devices"] - driver_dep.driver_name = VENDOR_MAPS.get(fpga["vendor_id"]).upper() + driver_dep.driver_name = VENDOR_MAPS.get(fpga["vendor_id"], '').upper() driver_dep.num_accelerators = 1 driver_dep.attach_handle_list = [_generate_attach_handle(fpga)] dep_list.append(driver_dep) diff --git a/cyborg/accelerator/drivers/fpga/xilinx/sysinfo.py b/cyborg/accelerator/drivers/fpga/xilinx/sysinfo.py index 9df3294b..48e0bf56 100644 --- a/cyborg/accelerator/drivers/fpga/xilinx/sysinfo.py +++ b/cyborg/accelerator/drivers/fpga/xilinx/sysinfo.py @@ -128,7 +128,7 @@ def _generate_dep_list(fpga): driver_dep.attribute_list = _generate_attribute_list(fpga) driver_dep.attach_handle_list = [] driver_dep.name = CONF.host + '_' + fpga["pci_addr"][0] - driver_dep.driver_name = VENDOR_MAPS.get(fpga["vendor_id"]).upper() + driver_dep.driver_name = VENDOR_MAPS.get(fpga["vendor_id"], '').upper() driver_dep.num_accelerators = 1 driver_dep.attach_handle_list = _generate_attach_handle(fpga) dep_list.append(driver_dep) diff --git a/cyborg/accelerator/drivers/gpu/utils.py b/cyborg/accelerator/drivers/gpu/utils.py index 3c7425da..ca631299 100644 --- a/cyborg/accelerator/drivers/gpu/utils.py +++ b/cyborg/accelerator/drivers/gpu/utils.py @@ -138,7 +138,7 @@ def _generate_dep_list(gpu): # once cyborg needs to support GPU devices discovered from a baremetal # node, we might need to support more formats. driver_dep.name = gpu.get('hostname', '') + '_' + gpu["devices"] - driver_dep.driver_name = VENDOR_MAPS.get(gpu["vendor_id"]).upper() + driver_dep.driver_name = VENDOR_MAPS.get(gpu["vendor_id"], '').upper() # driver_dep.num_accelerators for PGPU is 1, for VGPU should be the # available_instances of the vGPU device. # TODO(yumeng) support VGPU num report soon diff --git a/cyborg/accelerator/drivers/ssd/utils.py b/cyborg/accelerator/drivers/ssd/utils.py index 69a591dd..e7317c96 100644 --- a/cyborg/accelerator/drivers/ssd/utils.py +++ b/cyborg/accelerator/drivers/ssd/utils.py @@ -137,7 +137,7 @@ def _generate_dep_list(ssd): # once cyborg needs to support SSD devices discovered from a baremetal # node, we might need to support more formats. driver_dep.name = ssd.get('hostname', '') + '_' + ssd["devices"] - driver_dep.driver_name = VENDOR_MAPS.get(ssd["vendor_id"]).upper() + driver_dep.driver_name = VENDOR_MAPS.get(ssd["vendor_id"], '').upper() # driver_dep.num_accelerators for SSD is 1 driver_dep.num_accelerators = 1 driver_dep.attach_handle_list = [_generate_attach_handle(ssd)]