webnn: Remove some activations not usable with recurrent ops

clamp() and softmax() may no longer be created as MLActivations

More details on the spec PR:
webmachinelearning/webnn#703

Bug: 341518634
Change-Id: I7dda713c8be5454690f21c66665d90be274513f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5598089
Commit-Queue: Austin Sullivan <[email protected]>
Reviewed-by: Alex Gough <[email protected]>
Reviewed-by: ningxin hu <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1313205}

webnn/validation_tests/clamp.https.any.js

@@ -6,8 +6,7 @@
 
 validateInputFromAnotherBuilder('clamp');
 
-validateUnaryOperation(
-    'clamp', allWebNNOperandDataTypes, /*alsoBuildActivation=*/ true);
+validateUnaryOperation('clamp', allWebNNOperandDataTypes);
 
 promise_test(async t => {
   const options = {minValue: 1.0, maxValue: 3.0};
@@ -27,11 +26,6 @@ promise_test(async t => {
   assert_array_equals(output.shape(), [1, 2, 3, 4]);
 }, '[clamp] Test building an operator with options.minValue == options.maxValue');
 
-promise_test(async t => {
-  const options = {minValue: 2.0};
-  builder.clamp(options);
-}, '[clamp] Test building an activation with options');
-
 promise_test(async t => {
   const options = {minValue: 3.0, maxValue: 1.0};
   const input =
@@ -46,15 +40,3 @@ promise_test(async t => {
   const input = builder.input('input', {dataType: 'float16', dimensions: []});
   assert_throws_js(TypeError, () => builder.clamp(input, options));
 }, '[clamp] Throw if options.minValue is -Infinity when building an operator');
-
-promise_test(async t => {
-  const options = {minValue: 2.0, maxValue: -1.0};
-  assert_throws_js(TypeError, () => builder.clamp(options));
-}, '[clamp] Throw if options.minValue > options.maxValue when building an activation');
-
-// To be removed once NaN `maxValue` is allowed. Tracked in
-// https://github.com/webmachinelearning/webnn/pull/647.
-promise_test(async t => {
-  const options = {maxValue: NaN};
-  assert_throws_js(TypeError, () => builder.clamp(options));
-}, '[clamp] Throw if options.maxValue is NaN when building an activation');

webnn/validation_tests/gru.https.any.js

@@ -430,8 +430,8 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 }, '[gru] throw if initialHiddenState option is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const activation = builder.clamp();
-  const activationFromOtherBuilder = otherBuilder.clamp();
+  const activation = builder.relu();
+  const activationFromOtherBuilder = otherBuilder.relu();
   const options = {activations: [activation, activationFromOtherBuilder]};
 
   const input = builder.input('input', kExampleInputDescriptor);

webnn/validation_tests/gruCell.https.any.js

@@ -454,8 +454,8 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 }, '[gruCell] throw if recurrentBias option is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const activation = builder.clamp();
-  const activationFromOtherBuilder = otherBuilder.clamp();
+  const activation = builder.relu();
+  const activationFromOtherBuilder = otherBuilder.relu();
   const options = {activations: [activation, activationFromOtherBuilder]};
 
   const input = builder.input('input', kExampleInputDescriptor);

webnn/validation_tests/lstm.https.any.js

@@ -456,8 +456,8 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 }, '[lstm] throw if initialCellState option is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const activation = builder.clamp();
-  const activationFromOtherBuilder = otherBuilder.clamp();
+  const activation = builder.relu();
+  const activationFromOtherBuilder = otherBuilder.relu();
   const options = {activations: [activation, activationFromOtherBuilder]};
 
   const input = builder.input('input', kExampleInputDescriptor);

webnn/validation_tests/lstmCell.https.any.js

@@ -187,8 +187,8 @@ multi_builder_test(async (t, builder, otherBuilder) => {
 }, '[lstmCell] throw if peepholeWeight option is from another builder');
 
 multi_builder_test(async (t, builder, otherBuilder) => {
-  const activation = builder.clamp();
-  const activationFromOtherBuilder = otherBuilder.clamp();
+  const activation = builder.relu();
+  const activationFromOtherBuilder = otherBuilder.relu();
   const options = {activations: [activation, activationFromOtherBuilder]};
 
   const input = builder.input('input', kExampleInputDescriptor);