diff --git a/SYCL/Config/select_device.cpp b/SYCL/Config/select_device.cpp
index 91d5671aa0..7364841e43 100644
--- a/SYCL/Config/select_device.cpp
+++ b/SYCL/Config/select_device.cpp
@@ -180,38 +180,35 @@ int main() {
     fs.open("select_device_config.txt");
     if (fs.is_open()) {
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              std::string ver = dev.get_info<info::device::driver_version>();
-              if ((plt.get_backend() == backend::opencl) &&
-                  (sycl_be.find("opencl") != std::string::npos)) {
-                fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                   << "}}" << std::endl;
-                passed = true;
-                break;
-              } else if ((plt.get_backend() ==
-                          backend::ext_oneapi_level_zero) &&
-                         (sycl_be.find("level_zero") != std::string::npos)) {
-                fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                   << "}}" << std::endl;
-                passed = true;
-                break;
-              } else if ((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                         (sycl_be.find("cuda") != std::string::npos)) {
-                fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                   << "}}" << std::endl;
-                passed = true;
-                break;
-              } else if ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                         (sycl_be.find("hip") != std::string::npos)) {
-                fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                   << "}}" << std::endl;
-                passed = true;
-                break;
-              }
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            std::string ver = dev.get_info<info::device::driver_version>();
+            if ((plt.get_backend() == backend::opencl) &&
+                (sycl_be.find("opencl") != std::string::npos)) {
+              fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+                 << "}}" << std::endl;
+              passed = true;
+              break;
+            } else if ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                       (sycl_be.find("level_zero") != std::string::npos)) {
+              fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+                 << "}}" << std::endl;
+              passed = true;
+              break;
+            } else if ((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                       (sycl_be.find("cuda") != std::string::npos)) {
+              fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+                 << "}}" << std::endl;
+              passed = true;
+              break;
+            } else if ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                       (sycl_be.find("hip") != std::string::npos)) {
+              fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+                 << "}}" << std::endl;
+              passed = true;
+              break;
             }
           }
         }
@@ -313,25 +310,23 @@ int main() {
     fs.open("select_device_config.txt");
     if (fs.is_open()) {
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              std::string ver("98.76.54321");
-              if (((plt.get_backend() == backend::opencl) &&
-                   (sycl_be.find("opencl") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
-                   (sycl_be.find("level_zero") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                   (sycl_be.find("cuda") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                   (sycl_be.find("hip") != std::string::npos))) {
-                fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                   << "}}" << std::endl;
-                passed = true;
-                break;
-              }
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            std::string ver("98.76.54321");
+            if (((plt.get_backend() == backend::opencl) &&
+                 (sycl_be.find("opencl") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                 (sycl_be.find("level_zero") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                 (sycl_be.find("cuda") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                 (sycl_be.find("hip") != std::string::npos))) {
+              fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+                 << "}}" << std::endl;
+              passed = true;
+              break;
             }
           }
         }
@@ -446,45 +441,40 @@ int main() {
     fs.open("select_device_config.txt");
     if (fs.is_open()) {
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              std::string ver = dev.get_info<info::device::driver_version>();
-              size_t pos = 0;
-              if (((plt.get_backend() == backend::opencl) &&
-                   (sycl_be.find("opencl") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
-                   (sycl_be.find("level_zero") != std::string::npos))) {
-                if ((pos = ver.find(".")) == std::string::npos) {
-                  throw std::runtime_error(
-                      "Malformed syntax in version string");
-                }
-                pos++;
-                size_t start = pos;
-                if ((pos = ver.find(".", pos)) == std::string::npos) {
-                  throw std::runtime_error(
-                      "Malformed syntax in version string");
-                }
-                ver.replace(start, pos - start, "*");
-              } else if (((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                          (sycl_be.find("cuda") != std::string::npos)) ||
-                         ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                          (sycl_be.find("hip") != std::string::npos))) {
-                if ((pos = ver.find(".")) == std::string::npos) {
-                  throw std::runtime_error(
-                      "Malformed syntax in version string");
-                }
-                pos++;
-                ver.replace(pos, ver.length(), "*");
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            std::string ver = dev.get_info<info::device::driver_version>();
+            size_t pos = 0;
+            if (((plt.get_backend() == backend::opencl) &&
+                 (sycl_be.find("opencl") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                 (sycl_be.find("level_zero") != std::string::npos))) {
+              if ((pos = ver.find(".")) == std::string::npos) {
+                throw std::runtime_error("Malformed syntax in version string");
               }
-
-              fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                 << "}}" << std::endl;
-              passed = true;
-              break;
+              pos++;
+              size_t start = pos;
+              if ((pos = ver.find(".", pos)) == std::string::npos) {
+                throw std::runtime_error("Malformed syntax in version string");
+              }
+              ver.replace(start, pos - start, "*");
+            } else if (((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                        (sycl_be.find("cuda") != std::string::npos)) ||
+                       ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                        (sycl_be.find("hip") != std::string::npos))) {
+              if ((pos = ver.find(".")) == std::string::npos) {
+                throw std::runtime_error("Malformed syntax in version string");
+              }
+              pos++;
+              ver.replace(pos, ver.length(), "*");
             }
+
+            fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+               << "}}" << std::endl;
+            passed = true;
+            break;
           }
         }
       }
@@ -527,23 +517,21 @@ int main() {
     fs.open("select_device_config.txt");
     if (fs.is_open()) {
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              if (((plt.get_backend() == backend::opencl) &&
-                   (sycl_be.find("opencl") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
-                   (sycl_be.find("level_zero") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                   (sycl_be.find("cuda") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                   (sycl_be.find("hip") != std::string::npos))) {
-                fs << "DeviceName:{{" << name << "}}" << std::endl;
-                passed = true;
-                break;
-              }
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            if (((plt.get_backend() == backend::opencl) &&
+                 (sycl_be.find("opencl") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                 (sycl_be.find("level_zero") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                 (sycl_be.find("cuda") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                 (sycl_be.find("hip") != std::string::npos))) {
+              fs << "DeviceName:{{" << name << "}}" << std::endl;
+              passed = true;
+              break;
             }
           }
         }
@@ -636,29 +624,27 @@ int main() {
       std::stringstream ss;
       int count = 0;
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              std::string ver = dev.get_info<info::device::driver_version>();
-              if (((plt.get_backend() == backend::opencl) &&
-                   (sycl_be.find("opencl") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
-                   (sycl_be.find("level_zero") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                   (sycl_be.find("cuda") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                   (sycl_be.find("hip") != std::string::npos))) {
-                if (count > 0) {
-                  ss << " | ";
-                }
-                ss << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
-                   << "}}";
-                count++;
-                passed = true;
-                break;
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            std::string ver = dev.get_info<info::device::driver_version>();
+            if (((plt.get_backend() == backend::opencl) &&
+                 (sycl_be.find("opencl") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                 (sycl_be.find("level_zero") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                 (sycl_be.find("cuda") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                 (sycl_be.find("hip") != std::string::npos))) {
+              if (count > 0) {
+                ss << " | ";
               }
+              ss << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver
+                 << "}}";
+              count++;
+              passed = true;
+              break;
             }
           }
         }
@@ -703,23 +689,21 @@ int main() {
     fs.open("select_device_config.txt");
     if (fs.is_open()) {
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              if (((plt.get_backend() == backend::opencl) &&
-                   (sycl_be.find("opencl") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
-                   (sycl_be.find("level_zero") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                   (sycl_be.find("cuda") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                   (sycl_be.find("hip") != std::string::npos))) {
-                fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
-                passed = true;
-                break;
-              }
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            if (((plt.get_backend() == backend::opencl) &&
+                 (sycl_be.find("opencl") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                 (sycl_be.find("level_zero") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                 (sycl_be.find("cuda") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                 (sycl_be.find("hip") != std::string::npos))) {
+              fs << "DeviceName:HAHA{{" << name << "}}" << std::endl;
+              passed = true;
+              break;
             }
           }
         }
@@ -833,25 +817,23 @@ int main() {
     fs.open("select_device_config.txt");
     if (fs.is_open()) {
       for (const auto &plt : platform::get_platforms()) {
-        if (!plt.has(aspect::host)) {
-          for (const auto &dev : plt.get_devices()) {
-            if (dev.has(aspect::gpu)) {
-              std::string name = dev.get_info<info::device::name>();
-              addEscapeSymbolToSpecialCharacters(name);
-              std::string ver = dev.get_info<info::device::driver_version>();
-              if (((plt.get_backend() == backend::opencl) &&
-                   (sycl_be.find("opencl") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
-                   (sycl_be.find("level_zero") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_cuda) &&
-                   (sycl_be.find("cuda") != std::string::npos)) ||
-                  ((plt.get_backend() == backend::ext_oneapi_hip) &&
-                   (sycl_be.find("hip") != std::string::npos))) {
-                fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{"
-                   << ver << "}}" << std::endl;
-                passed = true;
-                break;
-              }
+        for (const auto &dev : plt.get_devices()) {
+          if (dev.has(aspect::gpu)) {
+            std::string name = dev.get_info<info::device::name>();
+            addEscapeSymbolToSpecialCharacters(name);
+            std::string ver = dev.get_info<info::device::driver_version>();
+            if (((plt.get_backend() == backend::opencl) &&
+                 (sycl_be.find("opencl") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_level_zero) &&
+                 (sycl_be.find("level_zero") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_cuda) &&
+                 (sycl_be.find("cuda") != std::string::npos)) ||
+                ((plt.get_backend() == backend::ext_oneapi_hip) &&
+                 (sycl_be.find("hip") != std::string::npos))) {
+              fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{" << ver
+                 << "}}" << std::endl;
+              passed = true;
+              break;
             }
           }
         }