fix rebase compilation errors

* pass WebNNGraph receiver to ContextImplOrt::CreateGraphImpl()
* remove instanceNorm layout check
* add BatchNormalizationAxis in context properties

Author: shiyi9801

services/webnn/ort/context_impl_ort.cc

@@ -267,6 +267,7 @@ ContextProperties ContextImplOrt::GetContextProperties(
 
   return ContextProperties(
       InputOperandLayout::kNchw, Resample2DAxes::kChannelsFirst,
+      BatchNormalizationAxis::kChannelsFirst,
       /*tensor_byte_length_limit=*/kTensorByteLengthLimit,
       {/*input=*/SupportedDataTypes::All(),
        /*constant=*/SupportedDataTypes::All(),
@@ -476,14 +477,16 @@ base::WeakPtr<WebNNContextImpl> ContextImplOrt::AsWeakPtr() {
 }
 
 void ContextImplOrt::CreateGraphImpl(
+    mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
     mojom::GraphInfoPtr graph_info,
     WebNNGraphImpl::ComputeResourceInfo compute_resource_info,
     base::flat_map<uint64_t, std::unique_ptr<WebNNConstantOperand>>
         constant_operands,
     CreateGraphImplCallback callback) {
-  GraphImplOrt::CreateAndBuild(
-      std::move(graph_info), std::move(compute_resource_info),
-      std::move(constant_operands), this, std::move(callback));
+  GraphImplOrt::CreateAndBuild(std::move(receiver), std::move(graph_info),
+                               std::move(compute_resource_info),
+                               std::move(constant_operands), this,
+                               std::move(callback));
 }
 
 void ContextImplOrt::CreateTensorImpl(

services/webnn/ort/context_impl_ort.h

@@ -61,6 +61,7 @@ class ContextImplOrt final : public WebNNContextImpl {
 
  private:
   void CreateGraphImpl(
+      mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
       mojom::GraphInfoPtr graph_info,
       WebNNGraphImpl::ComputeResourceInfo compute_resource_info,
       base::flat_map<uint64_t, std::unique_ptr<WebNNConstantOperand>>

services/webnn/ort/graph_builder_ort.cc

@@ -823,13 +823,6 @@ GraphBuilderOrt::AddBatchNormalizationOperation(
 
   const std::vector<uint32_t>& input_shape =
       GetOperand(batch_normalization.input_operand_id).descriptor.shape();
-  // TODO: Support NHWC layout-
-  // https://github.com/shiyi9801/chromium/issues/77
-  if (batch_normalization.axis != 1) {
-    return NewNotSupportedError(
-        "Unsupported axis since BatchNormalization only supports NCHW layout "
-        "currently. ");
-  }
   uint32_t input_channel = input_shape[1];
   std::vector<uint32_t> constant_dims = {input_channel};
 
@@ -2095,12 +2088,6 @@ GraphBuilderOrt::AddInstanceNormalizationOperation(
 
   const std::vector<uint32_t>& input_shape =
       GetOperand(instance_normalization.input_operand_id).descriptor.shape();
-  // TODO(crbug.com/387312212): Support NHWC layout
-  if (instance_normalization.layout ==
-      mojom::InputOperandLayout::kChannelsLast) {
-    return NewNotSupportedError(
-        "[WebNN] Currently InstanceNormalization only supports NCHW layout.");
-  }
   CHECK_EQ(context_properties_.input_operand_layout, InputOperandLayout::kNchw);
   uint32_t input_channel = input_shape[1];
   std::vector<uint32_t> constant_dims = {input_channel};

services/webnn/ort/graph_impl_ort.cc

@@ -132,6 +132,7 @@ class GraphImplOrt::ComputeResources {
 
 // static
 void GraphImplOrt::CreateAndBuild(
+    mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
     mojom::GraphInfoPtr graph_info,
     ComputeResourceInfo compute_resource_info,
     base::flat_map<uint64_t, std::unique_ptr<WebNNConstantOperand>>
@@ -141,8 +142,9 @@ void GraphImplOrt::CreateAndBuild(
   ScopedTrace scoped_trace("GraphImplOrt::CreateAndBuild");
 
   auto wrapped_callback = base::BindPostTaskToCurrentDefault(
-      base::BindOnce(&GraphImplOrt::DidCreateAndBuild, context->AsWeakPtr(),
-                     std::move(compute_resource_info), std::move(callback)));
+      base::BindOnce(&GraphImplOrt::DidCreateAndBuild, std::move(receiver),
+                     context->AsWeakPtr(), std::move(compute_resource_info),
+                     std::move(callback)));
 
   base::ThreadPool::PostTaskAndReplyWithResult(
       FROM_HERE,
@@ -224,6 +226,7 @@ GraphImplOrt::CreateAndBuildOnBackgroundThread(
 
 // static
 void GraphImplOrt::DidCreateAndBuild(
+    mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
     base::WeakPtr<WebNNContextImpl> context,
     ComputeResourceInfo compute_resource_info,
     WebNNContextImpl::CreateGraphImplCallback callback,
@@ -241,17 +244,20 @@ void GraphImplOrt::DidCreateAndBuild(
   }
 
   std::move(callback).Run(base::WrapUnique(new GraphImplOrt(
-      std::move(compute_resource_info), std::move(result.value()),
-      static_cast<ContextImplOrt*>(context.get()))));
+      std::move(receiver), std::move(compute_resource_info),
+      std::move(result.value()), static_cast<ContextImplOrt*>(context.get()))));
 }
 
 GraphImplOrt::~GraphImplOrt() = default;
 
 GraphImplOrt::GraphImplOrt(
+    mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
     ComputeResourceInfo compute_resource_info,
     std::unique_ptr<GraphImplOrt::ComputeResources> compute_resources,
     ContextImplOrt* context)
-    : WebNNGraphImpl(context, std::move(compute_resource_info)) {
+    : WebNNGraphImpl(std::move(receiver),
+                     context,
+                     std::move(compute_resource_info)) {
   compute_resources_state_ =
       base::MakeRefCounted<QueueableResourceState<ComputeResources>>(
           std::move(compute_resources));

services/webnn/ort/graph_impl_ort.h

@@ -39,6 +39,7 @@ class SessionOptions;
 class GraphImplOrt final : public WebNNGraphImpl {
  public:
   static void CreateAndBuild(
+      mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
       mojom::GraphInfoPtr graph_info,
       ComputeResourceInfo compute_resource_info,
       base::flat_map<uint64_t, std::unique_ptr<WebNNConstantOperand>>
@@ -53,7 +54,8 @@ class GraphImplOrt final : public WebNNGraphImpl {
  private:
   class ComputeResources;
 
-  GraphImplOrt(ComputeResourceInfo compute_resource_info,
+  GraphImplOrt(mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
+               ComputeResourceInfo compute_resource_info,
                std::unique_ptr<ComputeResources> compute_resources,
                ContextImplOrt* context);
 
@@ -67,6 +69,7 @@ class GraphImplOrt final : public WebNNGraphImpl {
       ScopedTrace scoped_trace);
 
   static void DidCreateAndBuild(
+      mojo::PendingAssociatedReceiver<mojom::WebNNGraph> receiver,
       base::WeakPtr<WebNNContextImpl> context,
       ComputeResourceInfo compute_resource_info,
       WebNNContextImpl::CreateGraphImplCallback callback,

services/webnn/webnn_context_provider_impl.cc

@@ -255,7 +255,7 @@ void WebNNContextProviderImpl::CreateWebNNContext(
 
     OrtLoggingLevel ort_logging_level = ORT_LOGGING_LEVEL_WARNING;
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kWebNNOrtLoggingLevel)) {
+            switches::kWebNNOrtLoggingLevel)) {
       std::string user_logging_level =
           base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
               switches::kWebNNOrtLoggingLevel);