From 3c9dd9256721e769acc5ed81a4dcddb679a76d12 Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <dwayner@microsoft.com>
Date: Wed, 23 Oct 2024 16:47:45 -0700
Subject: [PATCH 1/6] Remove pool2d MLRoundingType

---
 index.bs | 48 +++++++++++++-----------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/index.bs b/index.bs
index 095f8e3f..0ddf45b2 100644
--- a/index.bs
+++ b/index.bs
@@ -4575,10 +4575,6 @@ partial interface MLGraphBuilder {
 ### Pooling operations ### {#api-mlgraphbuilder-pool2d}
 Compute a pooling operation across all the elements within the moving window over the input tensor.
 <script type=idl>
-enum MLRoundingType {
-  "floor",
-  "ceil"
-};
 
 dictionary MLPool2dOptions {
   sequence<[EnforceRange] unsigned long> windowDimensions;
@@ -4586,7 +4582,6 @@ dictionary MLPool2dOptions {
   sequence<[EnforceRange] unsigned long> strides;
   sequence<[EnforceRange] unsigned long> dilations;
   MLInputOperandLayout layout = "nchw";
-  MLRoundingType roundingType = "floor";
   sequence<[EnforceRange] unsigned long> outputSizes;
 };
 
@@ -4638,10 +4633,14 @@ partial interface MLGraphBuilder {
 
     : <dfn>outputSizes</dfn>
     ::
-        A list of length 2.
-        Specifies the sizes of the two spacial dimensions of the output tensor. When the output sizes are explicitly specified, the {{MLPool2dOptions/roundingType}} is ignored.
+        A list of length 2: *[outputHeight, outputWidth]*
+        Specifies the sizes of the two spatial dimensions of the output tensor.
 
-        If not specified, the output sizes are automatically computed.
+        The spatial dimensions of the output tensor can be calculated as follows:
+
+        *output size = ((input size - filter size + beginning padding + ending padding) / stride) + 1*
+
+        Then the caller either applies a floor or ceiling depending on whether partial window results are desired.
 </dl>
 
 <div>
@@ -4652,13 +4651,8 @@ partial interface MLGraphBuilder {
 
     **Returns:** an {{MLOperand}}. The output 4-D tensor that contains the
     result of the reduction. The logical shape is interpreted according to the
-    value of *layout*. More specifically, if the *options.roundingType* is {{MLRoundingType/"floor"}}, the spatial dimensions of the output tensor can be calculated as follow:
-
-    *output size = floor(1 + (input size - filter size + beginning padding + ending padding) / stride)*
-
-    or if *options.roundingType* is {{MLRoundingType/"ceil"}}:
-
-    *output size = ceil(1 + (input size - filter size + beginning padding + ending padding) / stride)*
+    value of *layout*, taking the batch and channel count from the input with
+    the spatial sizes from *outputSizes*.
 </div>
 
 <div class="note">
@@ -4671,7 +4665,7 @@ partial interface MLGraphBuilder {
 
 <details open algorithm>
   <summary>
-    To <dfn for=MLGraphBuilder>calculate pool2d output sizes</dfn> given {{MLInputOperandLayout}} |layout|, [=/list=] of 4 unsigned integers |inputShape|, {{MLRoundingType}} |roundingType|, [=/list=] of 2 unsigned integers |windowDimensions|, [=/list=] of 4 unsigned integers |padding|, [=/list=] of 2 unsigned integers |strides|, [=/list=] of 2 unsigned integers |dilations|, and optional [=/list=] of 2 unsigned integers |outputSizes|, perform these steps. They return a [=/list=] of 4 unsigned integers.
+    To <dfn for=MLGraphBuilder>calculate pool2d output sizes</dfn> given {{MLInputOperandLayout}} |layout|, [=/list=] of 4 unsigned integers |inputShape|, [=/list=] of 2 unsigned integers |windowDimensions|, [=/list=] of 4 unsigned integers |padding|, [=/list=] of 2 unsigned integers |strides|, [=/list=] of 2 unsigned integers |dilations|, and optional [=/list=] of 2 unsigned integers |outputSizes|, perform these steps. They return a [=/list=] of 4 unsigned integers.
   </summary>
     1. Switch on |layout|:
         <dl class=switch>
@@ -4688,24 +4682,8 @@ partial interface MLGraphBuilder {
                 1. Let |inputWidth| be |inputShape|[2].
                 1. Let |channels| be |inputShape|[3].
         </dl>
-    1. If |outputSizes| is not given, then:
-        1. Let |outputHeight| be |outputSizes|[0].
-        1. Let |outputWidth| be |outputSizes|[1].
-    1. Otherwise:
-        1. Let |outputSizes| be the result of [=MLGraphBuilder/calculating conv2d output sizes=] given |inputHeight|, |inputWidth|, |windowDimensions|[0], |windowDimensions|[1], |padding|, |strides|, and |dilations|.
-        1. Let |outputHeight| be |outputSizes|[0].
-        1. Let |outputWidth| be |outputSizes|[1].
-        1. Switch on |roundingType|:
-            <dl class=switch>
-                : {{MLRoundingType/"floor"}}
-                ::
-                    1. Set |outputWidth| to floor(|outputWidth|).
-                    1. Set |outputHeight| to floor(|outputHeight|).
-                : {{MLRoundingType/"ceil"}}
-                ::
-                    1. Set |outputWidth| to ceiling(|outputWidth|).
-                    1. Set |outputHeight| to ceiling(|outputHeight|).
-            </dl>
+    1. Let |outputHeight| be |outputSizes|[0].
+    1. Let |outputWidth| be |outputSizes|[1].
     1. Switch on |layout|:
         <dl class=switch>
             : {{MLInputOperandLayout/"nchw"}}
@@ -4737,7 +4715,7 @@ partial interface MLGraphBuilder {
     1. If |options|.{{MLPool2dOptions/dilations}}'s [=list/size=] is not 2, then [=exception/throw=] a {{TypeError}}.
     1. If any value in |options|.{{MLPool2dOptions/dilations}} is not greater than 0, then [=exception/throw=] a {{TypeError}}.
     1. Let |desc| be a copy of |input|.{{MLOperand/[[descriptor]]}}.
-    1. Let |outputShape| be the result of [=MLGraphBuilder/calculating pool2d output sizes=] given |options|.{{MLPool2dOptions/layout}}, |input|'s [=MLOperand/shape=], |options|.{{MLPool2dOptions/roundingType}}, |options|.{{MLPool2dOptions/windowDimensions}}, |options|.{{MLPool2dOptions/padding}}, |options|.{{MLPool2dOptions/strides}}, |options|.{{MLPool2dOptions/dilations}}, and |options|.{{MLPool2dOptions/outputSizes}} (if it [=map/exists=]).
+    1. Let |outputShape| be the result of [=MLGraphBuilder/calculating pool2d output sizes=] given |options|.{{MLPool2dOptions/layout}}, |input|'s [=MLOperand/shape=], |options|.{{MLPool2dOptions/windowDimensions}}, |options|.{{MLPool2dOptions/padding}}, |options|.{{MLPool2dOptions/strides}}, |options|.{{MLPool2dOptions/dilations}}, and |options|.{{MLPool2dOptions/outputSizes}} (if it [=map/exists=]).
     1. If any [=list/item=] in |outputShape| is not a [=valid dimension=], then [=exception/throw=] a {{TypeError}}.
     1. Set |desc|.{{MLOperandDescriptor/dimensions}} to |outputShape|.
     1. *Make graph connections:*

From fdde61fb3902bfa0956a6d9e7647404532c8fd42 Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <dwayner@microsoft.com>
Date: Wed, 23 Oct 2024 20:30:01 -0700
Subject: [PATCH 2/6] Delete lingering rounding type field definition

---
 index.bs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.bs b/index.bs
index 24fe5429..be0f43e0 100644
--- a/index.bs
+++ b/index.bs
@@ -5405,10 +5405,6 @@ partial dictionary MLOpSupportLimits {
                 - input tensor: *[batches, height, width, inputChannels]*
                 - output tensor: *[batches, height, width, outputChannels]*
 
-    : <dfn>roundingType</dfn>
-    ::
-        The rounding function used to compute the output shape.
-
     : <dfn>outputSizes</dfn>
     ::
         A list of length 2: *[outputHeight, outputWidth]*

From 2e35d5d155a977573181268e5d507edf0410ba9c Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <dwayner@microsoft.com>
Date: Wed, 13 Nov 2024 15:59:39 -0800
Subject: [PATCH 3/6] Bikeshed warnings

---
 index.bs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.bs b/index.bs
index be0f43e0..69513914 100644
--- a/index.bs
+++ b/index.bs
@@ -870,7 +870,7 @@ dictionary MLComputeResult {
 interface MLContext {
   Promise<MLComputeResult> compute(
       MLGraph graph, MLNamedArrayBufferViews inputs, MLNamedArrayBufferViews outputs);
-  
+
   MLOpSupportLimits opSupportLimits();
 };
 </script>
@@ -5449,7 +5449,7 @@ partial dictionary MLOpSupportLimits {
 
 <details open algorithm>
   <summary>
-    To <dfn for=MLGraphBuilder>calculate pool2d output sizes</dfn> given {{MLInputOperandLayout}} |layout|, [=/list=] of 4 unsigned integers |inputShape|, [=/list=] of 2 unsigned integers |windowDimensions|, [=/list=] of 4 unsigned integers |padding|, [=/list=] of 2 unsigned integers |strides|, [=/list=] of 2 unsigned integers |dilations|, and optional [=/list=] of 2 unsigned integers |outputSizes|, perform these steps. They return a [=/list=] of 4 unsigned integers.
+    To <dfn for=MLGraphBuilder>calculate pool2d output sizes</dfn> given {{MLInputOperandLayout}} |layout|, [=/list=] of 4 unsigned integers |inputShape|, [=/list=] of 2 unsigned integers <var ignore>windowDimensions</var>, [=/list=] of 4 unsigned integers <var ignore>padding</var>, [=/list=] of 2 unsigned integers <var ignore>strides</var>, [=/list=] of 2 unsigned integers <var ignore>dilations</var>, and optional [=/list=] of 2 unsigned integers |outputSizes|, perform these steps. They return a [=/list=] of 4 unsigned integers.
   </summary>
     1. Switch on |layout|:
         <dl class=switch>

From 8761da5bccfdf3a52f611abade6e60993be390b8 Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <dwayner@microsoft.com>
Date: Wed, 13 Nov 2024 16:10:39 -0800
Subject: [PATCH 4/6] Make outputSizes required

---
 index.bs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.bs b/index.bs
index 69513914..ddf4f2a5 100644
--- a/index.bs
+++ b/index.bs
@@ -5354,13 +5354,13 @@ dictionary MLPool2dOptions : MLOperatorOptions {
   sequence<[EnforceRange] unsigned long> strides;
   sequence<[EnforceRange] unsigned long> dilations;
   MLInputOperandLayout layout = "nchw";
-  sequence<[EnforceRange] unsigned long> outputSizes;
+  required sequence<[EnforceRange] unsigned long> outputSizes;
 };
 
 partial interface MLGraphBuilder {
-  MLOperand averagePool2d(MLOperand input, optional MLPool2dOptions options = {});
-  MLOperand l2Pool2d(MLOperand input, optional MLPool2dOptions options = {});
-  MLOperand maxPool2d(MLOperand input, optional MLPool2dOptions options = {});
+  MLOperand averagePool2d(MLOperand input, required MLPool2dOptions options);
+  MLOperand l2Pool2d(MLOperand input, required  MLPool2dOptions options);
+  MLOperand maxPool2d(MLOperand input, required  MLPool2dOptions options);
 };
 
 partial dictionary MLOpSupportLimits {

From 84d78fe47d4afda21d10424d860cd4cec5e378e7 Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <dwayner@microsoft.com>
Date: Wed, 13 Nov 2024 16:13:57 -0800
Subject: [PATCH 5/6] Nit extra space after required

---
 index.bs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.bs b/index.bs
index bc2877d2..e3a53783 100644
--- a/index.bs
+++ b/index.bs
@@ -5295,8 +5295,8 @@ dictionary MLPool2dOptions : MLOperatorOptions {
 
 partial interface MLGraphBuilder {
   MLOperand averagePool2d(MLOperand input, required MLPool2dOptions options);
-  MLOperand l2Pool2d(MLOperand input, required  MLPool2dOptions options);
-  MLOperand maxPool2d(MLOperand input, required  MLPool2dOptions options);
+  MLOperand l2Pool2d(MLOperand input, required MLPool2dOptions options);
+  MLOperand maxPool2d(MLOperand input, required MLPool2dOptions options);
 };
 
 partial dictionary MLOpSupportLimits {

From 54aacac93c0ffcd4c1d6af48f6351e9b1be329fa Mon Sep 17 00:00:00 2001
From: Dwayne Robinson <dwayner@microsoft.com>
Date: Wed, 13 Nov 2024 16:25:09 -0800
Subject: [PATCH 6/6] Revert required dictionary since it causes bikeshed
 errors

---
 index.bs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.bs b/index.bs
index e3a53783..c6fa24bd 100644
--- a/index.bs
+++ b/index.bs
@@ -5294,9 +5294,9 @@ dictionary MLPool2dOptions : MLOperatorOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand averagePool2d(MLOperand input, required MLPool2dOptions options);
-  MLOperand l2Pool2d(MLOperand input, required MLPool2dOptions options);
-  MLOperand maxPool2d(MLOperand input, required MLPool2dOptions options);
+  MLOperand averagePool2d(MLOperand input, optional MLPool2dOptions options = {});
+  MLOperand l2Pool2d(MLOperand input, optional MLPool2dOptions options = {});
+  MLOperand maxPool2d(MLOperand input, optional MLPool2dOptions options = {});
 };
 
 partial dictionary MLOpSupportLimits {