one more fix

Author: Dmitry Razdoburdin

plugin/sycl/device_manager.cc

@@ -70,18 +70,25 @@ ::sycl::queue DeviceManager::GetQueue(const DeviceOrd& device_spec) const {
     std::lock_guard<std::mutex> guard(queue_registering_mutex);
     if (not_use_default_selector) {
         DeviceRegister& device_register = GetDevicesRegister();
-        const int device_idx =
-            collective::IsDistributed() ? collective::GetRank() : device_spec.ordinal;
         if (device_spec.IsSyclDefault()) {
             auto& devices = device_register.devices;
+            const int device_idx = collective::IsDistributed()
+                                   ? collective::GetRank() % devices.size()
+                                   : device_spec.ordinal;
             CHECK_LT(device_idx, devices.size());
             queue_register[device_spec.Name()] = ::sycl::queue(devices[device_idx]);
         } else if (device_spec.IsSyclCPU()) {
             auto& cpu_devices = device_register.cpu_devices;
+            const int device_idx = collective::IsDistributed()
+                                   ? collective::GetRank() % cpu_devices.size()
+                                   : device_spec.ordinal;
             CHECK_LT(device_idx, cpu_devices.size());
             queue_register[device_spec.Name()] = ::sycl::queue(cpu_devices[device_idx]);
         } else if (device_spec.IsSyclGPU()) {
             auto& gpu_devices = device_register.gpu_devices;
+            const int device_idx = collective::IsDistributed()
+                                  ? collective::GetRank() % gpu_devices.size()
+                                  : device_spec.ordinal;
             CHECK_LT(device_idx, gpu_devices.size());
             queue_register[device_spec.Name()] = ::sycl::queue(gpu_devices[device_idx]);
         }