From 1e6c28d324b0aa6cc002d00771fa33e7426c106d Mon Sep 17 00:00:00 2001
From: Dmitry Razdoburdin <>
Date: Fri, 20 Sep 2024 07:24:01 -0700
Subject: [PATCH] fix host_device_vector for default device ordinal

---
 plugin/sycl/common/host_device_vector.cc         |  2 --
 tests/cpp/plugin/test_sycl_host_device_vector.cc | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugin/sycl/common/host_device_vector.cc b/plugin/sycl/common/host_device_vector.cc
index 62a305cf27ca..6a4cb38606a4 100644
--- a/plugin/sycl/common/host_device_vector.cc
+++ b/plugin/sycl/common/host_device_vector.cc
@@ -218,8 +218,6 @@ class HostDeviceVectorImpl {
   }
 
   void SetDevice() {
-    CHECK_GE(device_.ordinal, 0);
-
     if (!qu_) {
       qu_ = device_manager_.GetQueue(device_);
     }
diff --git a/tests/cpp/plugin/test_sycl_host_device_vector.cc b/tests/cpp/plugin/test_sycl_host_device_vector.cc
index 774a3d507247..a036fb0e89d5 100644
--- a/tests/cpp/plugin/test_sycl_host_device_vector.cc
+++ b/tests/cpp/plugin/test_sycl_host_device_vector.cc
@@ -91,13 +91,13 @@ void TestHostDeviceVector(size_t n, DeviceOrd device) {
 
 TEST(SyclHostDeviceVector, Basic) {
   size_t n = 1001;
-  DeviceOrd device = DeviceOrd::SyclDefault(0);
+  DeviceOrd device = DeviceOrd::SyclDefault();
   TestHostDeviceVector(n, device);
 }
 
 TEST(SyclHostDeviceVector, Copy) {
   size_t n = 1001;
-  auto device = DeviceOrd::SyclDefault(0);
+  auto device = DeviceOrd::SyclDefault();
 
   HostDeviceVector<int> v;
   {
@@ -116,7 +116,7 @@ TEST(SyclHostDeviceVector, Copy) {
 
 TEST(SyclHostDeviceVector, Fill) {
   size_t n = 1001;
-  auto device = DeviceOrd::SyclDefault(0);
+  auto device = DeviceOrd::SyclDefault();
 
   int val = 42;
   HostDeviceVector<int> v;
@@ -138,7 +138,7 @@ TEST(SyclHostDeviceVector, Fill) {
 TEST(SyclHostDeviceVector, Extend) {
   size_t n0 = 1001;
   size_t n1 = 17;
-  auto device = DeviceOrd::SyclDefault(0);
+  auto device = DeviceOrd::SyclDefault();
 
   int val = 42;
   HostDeviceVector<int> v0;
@@ -169,7 +169,7 @@ TEST(SyclHostDeviceVector, SetDevice) {
     h_vec[i] = i;
   }
   HostDeviceVector<int> vec (h_vec);
-  auto device = DeviceOrd::SyclDefault(0);
+  auto device = DeviceOrd::SyclDefault();
 
   vec.SetDevice(device);
   ASSERT_EQ(vec.Size(), h_vec.size());
@@ -185,7 +185,7 @@ TEST(SyclHostDeviceVector, SetDevice) {
 
 TEST(SyclHostDeviceVector, Span) {
   HostDeviceVector<float> vec {1.0f, 2.0f, 3.0f, 4.0f};
-  vec.SetDevice(DeviceOrd::SyclDefault(0));
+  vec.SetDevice(DeviceOrd::SyclDefault());
   auto span = vec.DeviceSpan();
   ASSERT_EQ(vec.Size(), span.size());
   ASSERT_EQ(vec.DevicePointer(), span.data());
@@ -222,7 +222,7 @@ TEST(SyclHostDeviceVector, Resize) {
   };
   {
     HostDeviceVector<float> vec{1.0f, 2.0f, 3.0f, 4.0f};
-    vec.SetDevice(DeviceOrd::SyclDefault(0));
+    vec.SetDevice(DeviceOrd::SyclDefault());
     vec.ConstDeviceSpan();
     ASSERT_TRUE(vec.DeviceCanRead());
     ASSERT_FALSE(vec.DeviceCanWrite());
@@ -232,7 +232,7 @@ TEST(SyclHostDeviceVector, Resize) {
     check(vec);
   }
   {
-    HostDeviceVector<float> vec{{1.0f, 2.0f, 3.0f, 4.0f}, DeviceOrd::SyclDefault(0)};
+    HostDeviceVector<float> vec{{1.0f, 2.0f, 3.0f, 4.0f}, DeviceOrd::SyclDefault()};
     ASSERT_TRUE(vec.DeviceCanWrite());
     vec.Resize(7, 3.0f);
     ASSERT_TRUE(vec.DeviceCanWrite());