more clean up

Author: JacobSzwejbka

exir/emit/_emitter.py

@@ -1185,29 +1185,6 @@ def _emit_control_flow(
         """
         specs = self.node.meta["spec"]
 
-        # For map and scan operations, the stacked output tensors are built up
-        # incrementally via et_copy_index. These tensors need to be marked as
-        # DYNAMIC_BOUND to allow resizing during execution, even if their shape
-        # appears static.
-        if target is torch.ops.higher_order.map_impl:
-            # Map stacks all outputs, so all output specs need DYNAMIC_BOUND
-            def mark_dynamic_bounded(spec: TensorSpec) -> TensorSpec:
-                spec.shape_dynamism = TensorShapeDynamism.DYNAMIC_BOUND
-                return spec
-
-            specs = pytree.tree_map(mark_dynamic_bounded, specs)
-
-        elif target is torch.ops.higher_order.scan:
-            # Scan has (carry_outputs, y_outputs). Only y_outputs are stacked
-            # and need DYNAMIC_BOUND. carry_outputs keep their original dynamism.
-            init = args[1]
-            num_carry = len(init) if isinstance(init, (list, tuple)) else 1
-
-            flat_specs, spec_tree = pytree.tree_flatten(specs)
-            for i in range(num_carry, len(flat_specs)):
-                flat_specs[i].shape_dynamism = TensorShapeDynamism.DYNAMIC_BOUND
-            specs = pytree.tree_unflatten(flat_specs, spec_tree)
-
         subemitter_binding_output_values = pytree.tree_map(
             lambda spec: self._emit_spec(spec),
             specs,

kernels/prim_ops/test/prim_ops_test.cpp

@@ -281,42 +281,6 @@ TEST_F(RegisterPrimOpsTest, TestETCopyIndexMismatchShape) {
       getOpsFn("executorch_prim::et_copy_index.tensor")(context_, stack));
 }
 
-TEST_F(RegisterPrimOpsTest, TestETCopyIndexStaticShape) {
-  int64_t index = 1;
-  testing::TensorFactory<ScalarType::Int> tf;
-
-  EValue values[3];
-  EValue* stack[3];
-
-  // Test with static shape tensors.
-  const std::vector<int> buf = {1, 2, 3, 4};
-  auto copy_to = tf.make({2, 2}, buf);
-  auto to_copy = tf.make({2}, {5, 6});
-
-  values[0] = EValue(copy_to);
-  values[1] = EValue(to_copy);
-  values[2] = EValue(index);
-
-  stack[0] = &values[0];
-  stack[1] = &values[1];
-  stack[2] = &values[2];
-
-  // Copy and replace at index 1.
-  getOpsFn("executorch_prim::et_copy_index.tensor")(context_, stack);
-  EXPECT_EQ(copy_to.sizes()[0], 2);
-  EXPECT_EQ(copy_to.sizes()[1], 2);
-  EXPECT_TENSOR_EQ(copy_to, tf.make({2, 2}, {1, 2, 5, 6}));
-
-#ifndef USE_ATEN_LIB
-  // Copy and replace at index 2. This should trigger an EXPECT
-  // in lean mode.
-  index = 2;
-  values[2] = EValue(index);
-  ET_EXPECT_DEATH(
-      getOpsFn("executorch_prim::et_copy_index.tensor")(context_, stack), "");
-#endif
-}
-
 TEST_F(RegisterPrimOpsTest, TestBooleanOps) {
   EValue values[3];
   double a = 3;