always follow pci bus id

This commit is contained in:
Concedo 2024-12-18 00:46:48 +08:00
parent bc297da91e
commit 6089421423

View file

@ -447,35 +447,29 @@ def set_backend_props(inputs):
# otherwise the default will divide equally and multigpu crap will slow it down badly # otherwise the default will divide equally and multigpu crap will slow it down badly
inputs.cublas_info = 0 inputs.cublas_info = 0
if args.usecublas:
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
if not args.tensor_split: if not args.tensor_split:
if (args.usecublas and "0" in args.usecublas): if (args.usecublas and "0" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
os.environ["CUDA_VISIBLE_DEVICES"] = "0" os.environ["CUDA_VISIBLE_DEVICES"] = "0"
os.environ["HIP_VISIBLE_DEVICES"] = "0" os.environ["HIP_VISIBLE_DEVICES"] = "0"
elif (args.usecublas and "1" in args.usecublas): elif (args.usecublas and "1" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
os.environ["CUDA_VISIBLE_DEVICES"] = "1" os.environ["CUDA_VISIBLE_DEVICES"] = "1"
os.environ["HIP_VISIBLE_DEVICES"] = "1" os.environ["HIP_VISIBLE_DEVICES"] = "1"
elif (args.usecublas and "2" in args.usecublas): elif (args.usecublas and "2" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
os.environ["CUDA_VISIBLE_DEVICES"] = "2" os.environ["CUDA_VISIBLE_DEVICES"] = "2"
os.environ["HIP_VISIBLE_DEVICES"] = "2" os.environ["HIP_VISIBLE_DEVICES"] = "2"
elif (args.usecublas and "3" in args.usecublas): elif (args.usecublas and "3" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
os.environ["CUDA_VISIBLE_DEVICES"] = "3" os.environ["CUDA_VISIBLE_DEVICES"] = "3"
os.environ["HIP_VISIBLE_DEVICES"] = "3" os.environ["HIP_VISIBLE_DEVICES"] = "3"
else: else:
if (args.usecublas and "0" in args.usecublas): if (args.usecublas and "0" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
inputs.cublas_info = 0 inputs.cublas_info = 0
elif (args.usecublas and "1" in args.usecublas): elif (args.usecublas and "1" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
inputs.cublas_info = 1 inputs.cublas_info = 1
elif (args.usecublas and "2" in args.usecublas): elif (args.usecublas and "2" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
inputs.cublas_info = 2 inputs.cublas_info = 2
elif (args.usecublas and "3" in args.usecublas): elif (args.usecublas and "3" in args.usecublas):
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
inputs.cublas_info = 3 inputs.cublas_info = 3
if args.usevulkan: #is an empty array if using vulkan without defined gpu if args.usevulkan: #is an empty array if using vulkan without defined gpu