microsoft · fs-eire · Mar 4, 2026 · Mar 3, 2026 · Mar 3, 2026 · Mar 4, 2026
diff --git a/cmake/onnxruntime_providers_webgpu.cmake b/cmake/onnxruntime_providers_webgpu.cmake
@@ -6,9 +6,6 @@
   endif()
 
   add_compile_definitions(USE_WEBGPU=1)
-  if(onnxruntime_BUILD_WEBGPU_EP_STATIC_LIB)
-    add_compile_definitions(BUILD_WEBGPU_EP_STATIC_LIB=1)
-  endif()
 
   if (onnxruntime_ENABLE_WEBASSEMBLY_THREADS)
     add_definitions(-DENABLE_WEBASSEMBLY_THREADS=1)

diff --git a/include/onnxruntime/ep/adapters.h b/include/onnxruntime/ep/adapters.h
@@ -3,13 +3,15 @@
 
 #pragma once
 
-#include "api.h"
-#include "common.h"
-
-// This header is only used when building WebGPU/CUDA EP as a shared library.
+// This header is only used when building WebGPU/CUDA EP as a plugin EP library.
 //
 // This header file is used as a precompiled header so it is always included first.
 
+#define ORT_EP_API_ADAPTER
+
+#include "api.h"
+#include "common.h"
+
 #pragma push_macro("ORT_EP_API_ADAPTER_HEADER_INCLUDED")
 #undef ORT_EP_API_ADAPTER_HEADER_INCLUDED
 #define ORT_EP_API_ADAPTER_HEADER_INCLUDED

diff --git a/onnxruntime/core/dll/delay_load_hook.cc b/onnxruntime/core/dll/delay_load_hook.cc
@@ -21,13 +21,13 @@
 // - https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order#alternate-search-order-for-unpackaged-apps
 //
 // The DLL DelayLoad hook is only enabled when the compiler is MSVC and at least one of the following is True:
-// - all of the following are defined:
-//   - USE_WEBGPU
-//   - BUILD_WEBGPU_EP_STATIC_LIB
-//   - BUILD_DAWN_SHARED_LIBRARY
+// - all of the following are true:
+//   - USE_WEBGPU is defined
+//   - ORT_EP_API_ADAPTER is NOT defined (i.e., WebGPU EP is statically linked)
+//   - BUILD_DAWN_SHARED_LIBRARY is defined
 // - USE_DML is defined
 //
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB) && defined(BUILD_DAWN_SHARED_LIBRARY)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER) && defined(BUILD_DAWN_SHARED_LIBRARY)
 #define ORT_DELAY_LOAD_WEBGPU_DAWN_DLL 1
 #else
 #define ORT_DELAY_LOAD_WEBGPU_DAWN_DLL 0

diff --git a/onnxruntime/core/providers/get_execution_providers.cc b/onnxruntime/core/providers/get_execution_providers.cc
@@ -158,7 +158,7 @@ constexpr ProviderInfo kProvidersInPriorityOrder[] =
         },
         {
             kWebGpuExecutionProvider,
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
             true,
 #else
             false,

diff --git a/onnxruntime/core/session/ort_env.cc b/onnxruntime/core/session/ort_env.cc
@@ -19,7 +19,7 @@ std::atomic<bool> g_is_shutting_down(false);
 using namespace onnxruntime;
 using namespace onnxruntime::logging;
 
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
 namespace onnxruntime {
 namespace webgpu {
 void CleanupWebGpuContexts();
@@ -41,7 +41,7 @@ OrtEnv::~OrtEnv() {
   UnloadSharedProviders();
 #endif
 
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
   // Explicitly destroy the Environment first, which will properly clean up DataTransferManager
   // and call ReleaseImpl on WebGpuDataTransferImpl
   value_.reset();

diff --git a/onnxruntime/core/session/plugin_ep/ep_factory_webgpu.cc b/onnxruntime/core/session/plugin_ep/ep_factory_webgpu.cc
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
 #include "core/session/plugin_ep/ep_factory_webgpu.h"
 
 #include "core/framework/error_code_helper.h"
@@ -73,4 +73,4 @@ OrtStatus* WebGpuEpFactory::CreateDataTransfer(_Outptr_result_maybenull_ OrtData
 
 }  // namespace onnxruntime
 
-#endif  // defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#endif  // defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
diff --git a/onnxruntime/core/session/plugin_ep/ep_factory_webgpu.h b/onnxruntime/core/session/plugin_ep/ep_factory_webgpu.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
 #include "core/session/plugin_ep/ep_factory_internal_impl.h"
 
 #include "core/graph/constants.h"
@@ -34,4 +34,4 @@ class WebGpuEpFactory : public EpFactoryInternalImpl {
 };
 }  // namespace onnxruntime
 
-#endif  // defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#endif  // defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
diff --git a/onnxruntime/core/session/plugin_ep/ep_library_internal.cc b/onnxruntime/core/session/plugin_ep/ep_library_internal.cc
@@ -23,7 +23,7 @@ std::unique_ptr<EpLibraryInternal> EpLibraryInternal::CreateDmlEp() {
 }
 #endif
 
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
 std::unique_ptr<EpLibraryInternal> EpLibraryInternal::CreateWebGpuEp() {
   auto webgpu_factory_impl = std::make_unique<WebGpuEpFactory>();
   auto internal_factory = std::make_unique<EpFactoryInternal>(std::move(webgpu_factory_impl));
@@ -38,7 +38,7 @@ std::vector<std::unique_ptr<EpLibraryInternal>> EpLibraryInternal::CreateInterna
   // CPU EP
   internal_eps.push_back(CreateCpuEp());
 
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
   internal_eps.push_back(CreateWebGpuEp());
 #endif
 

diff --git a/onnxruntime/core/session/plugin_ep/ep_library_internal.h b/onnxruntime/core/session/plugin_ep/ep_library_internal.h
@@ -47,7 +47,7 @@ class EpLibraryInternal : public EpLibrary {
 #if defined(USE_DML)
   static std::unique_ptr<EpLibraryInternal> CreateDmlEp();
 #endif
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
   static std::unique_ptr<EpLibraryInternal> CreateWebGpuEp();
 #endif
 

diff --git a/onnxruntime/core/session/provider_registration.cc b/onnxruntime/core/session/provider_registration.cc
@@ -257,7 +257,7 @@ ORT_API_STATUS_IMPL(OrtApis::SessionOptionsAppendExecutionProvider,
       break;
     }
     case EpID::WebGPU: {
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
       options->provider_factories.push_back(WebGpuProviderFactoryCreator::Create(options->value.config_options));
 #else
       status = create_not_supported_status();

diff --git a/onnxruntime/test/unittest_util/base_tester.cc b/onnxruntime/test/unittest_util/base_tester.cc
@@ -676,7 +676,7 @@ void BaseTester::RunWithConfig(size_t* number_of_pre_packed_weights_counter,
           kQnnExecutionProvider,
           kSnpeExecutionProvider,
           kXnnpackExecutionProvider,
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
           kWebGpuExecutionProvider,
 #endif
       };
@@ -750,7 +750,7 @@ void BaseTester::RunWithConfig(size_t* number_of_pre_packed_weights_counter,
           execution_provider = DefaultXnnpackExecutionProvider();
         else if (provider_type == onnxruntime::kDmlExecutionProvider)
           execution_provider = DefaultDmlExecutionProvider();
-#if !defined(USE_WEBGPU) || defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if !defined(USE_WEBGPU) || !defined(ORT_EP_API_ADAPTER)
         else if (provider_type == onnxruntime::kWebGpuExecutionProvider)
           execution_provider = DefaultWebGpuExecutionProvider();
 #endif

diff --git a/onnxruntime/test/util/default_providers.cc b/onnxruntime/test/util/default_providers.cc
@@ -282,7 +282,7 @@ std::unique_ptr<IExecutionProvider> DefaultXnnpackExecutionProvider() {
 }
 
 std::unique_ptr<IExecutionProvider> DefaultWebGpuExecutionProvider(bool is_nhwc) {
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
   ConfigOptions config_options{};
   // Disable storage buffer cache
   ORT_ENFORCE(config_options.AddConfigEntry(webgpu::options::kStorageBufferCacheMode,
@@ -302,7 +302,7 @@ std::unique_ptr<IExecutionProvider> DefaultWebGpuExecutionProvider(bool is_nhwc)
 }
 
 std::unique_ptr<IExecutionProvider> WebGpuExecutionProviderWithOptions(const ConfigOptions& config_options) {
-#if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+#if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
   return WebGpuProviderFactoryCreator::Create(config_options)->CreateProvider();
 #else
   ORT_UNUSED_PARAMETER(config_options);
-Original file line number
+Diff line change
@@ Expand Up / @@ -158,7 +158,7 @@ constexpr ProviderInfo kProvidersInPriorityOrder[] = @@
             },
             {
                 kWebGpuExecutionProvider,
-    #if defined(USE_WEBGPU) && defined(BUILD_WEBGPU_EP_STATIC_LIB)
+    #if defined(USE_WEBGPU) && !defined(ORT_EP_API_ADAPTER)
                 true,
     #else
                 false,
@@ Expand Down @@