[ur] Remove null adapter default load

oneapi-src · Feb 14, 2023 · af59031 · af59031
1 parent 61cb864
commit af59031
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -32,7 +32,7 @@ jobs:
 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure -L "python|uma|loader|validation"
+      run: UR_ADAPTERS_FORCE_LOAD={{github.workspace}}/build/lib/libur_null.so ctest UR_ENABLE_VALIDATION_LAYER=1 UR_ENABLE_PARAMETER_VALIDATION=1 -C ${{env.BUILD_TYPE}} --output-on-failure -L "python|uma|loader|validation"
 
   windows-build:
     name: Build - Windows
@@ -59,4 +59,4 @@ jobs:
 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure -L "python|uma|loader|validation"
+      run: UR_ADAPTERS_FORCE_LOAD={{github.workspace}}/build/lib/libur_null.dll UR_ENABLE_VALIDATION_LAYER=1 UR_ENABLE_PARAMETER_VALIDATION=1 ctest -C ${{env.BUILD_TYPE}} --output-on-failure -L "python|uma|loader|validation"
diff --git a/source/loader/linux/platform_discovery_lin.cpp b/source/loader/linux/platform_discovery_lin.cpp
@@ -15,9 +15,7 @@
 
 namespace loader {
 
-static const char *knownPlatformNames[] = {
-    MAKE_LIBRARY_NAME("ur_null", UR_VERSION),
-};
+static const char *knownPlatformNames[] = {};
 
 std::vector<PlatformLibraryPath> discoverEnabledPlatforms() {
     std::vector<PlatformLibraryPath> enabledPlatforms;

diff --git a/source/loader/windows/platform_discovery_win.cpp b/source/loader/windows/platform_discovery_win.cpp
@@ -21,9 +21,7 @@
 
 namespace loader {
 
-static const char *knownAdaptersNames[] = {
-    MAKE_LIBRARY_NAME("ur_null", UR_VERSION),
-};
+static const char *knownAdaptersNames[] = {};
 
 std::vector<PlatformLibraryPath> discoverEnabledPlatforms() {
     std::vector<PlatformLibraryPath> enabledPlatforms;

diff --git a/test/conformance/source/environment.cpp b/test/conformance/source/environment.cpp
@@ -32,7 +32,13 @@ uur::PlatformEnvironment::PlatformEnvironment(int argc, char **argv)
     : platform_options{parsePlatformOptions(argc, argv)} {
     instance = this;
     ur_device_init_flags_t device_flags = 0;
-    if (urInit(device_flags)) {
+    switch (urInit(device_flags)) {
+    case UR_RESULT_SUCCESS:
+        break;
+    case UR_RESULT_ERROR_UNINITIALIZED:
+        error = "Could not load adapter";
+        return;
+    default:
         error = "urInit() failed";
         return;
     }
@@ -100,11 +106,18 @@ uur::PlatformEnvironment::PlatformEnvironment(int argc, char **argv)
 
 void uur::PlatformEnvironment::SetUp() {
     if (!error.empty()) {
-        FAIL() << error;
+        if (error == "Could not load adapter") {
+            GTEST_SKIP() << error;
+        } else {
+            FAIL() << error;
+        }
     }
 }
 
 void uur::PlatformEnvironment::TearDown() {
+    if (error == "Could not load adapter") {
+        return;
+    }
     ur_tear_down_params_t tear_down_params{};
     if (urTearDown(&tear_down_params)) {
         FAIL() << "urTearDown() failed";
@@ -155,8 +168,21 @@ DevicesEnvironment::DevicesEnvironment(int argc, char **argv)
 
 void DevicesEnvironment::SetUp() {
     PlatformEnvironment::SetUp();
+    if (error == "Could not load adapter") {
+        return;
+    }
     if (devices.empty() || !error.empty()) {
         FAIL() << error;
     }
 }
+
+void DevicesEnvironment::TearDown() {
+    PlatformEnvironment::TearDown();
+    for (auto device : devices) {
+        if (urDeviceRelease(device)) {
+            error = "urDeviceRelease() failed";
+            return;
+        }
+    }
+}
 } // namespace uur
diff --git a/test/conformance/testing/uur/environment.h b/test/conformance/testing/uur/environment.h
@@ -36,7 +36,7 @@ struct DevicesEnvironment : PlatformEnvironment {
     virtual ~DevicesEnvironment() override = default;
 
     virtual void SetUp() override;
-    inline virtual void TearDown() override { PlatformEnvironment::TearDown(); }
+    virtual void TearDown() override;
 
     inline const std::vector<ur_device_handle_t> &GetDevices() const {
         return devices;