solve confilcts in test_opt.py, test_subtensor_inc_subtensor

theano/tensor/opt.py

@@ -1894,7 +1894,8 @@ def local_track_shape_i(node):
         replacement = shape_feature.scheduled[node]
         return [shape_feature.shape_of[replacement][node.op.i]]
 
-#TH-2801 opt: subtensor(incsubtensor)
+
+# TH-2801 opt: subtensor(incsubtensor)
 @register_specialize
 @register_canonicalize
 @gof.local_optimizer([Subtensor])
@@ -1905,11 +1906,13 @@ def local_subtensor_inc_subtensor(node):
             return
         if not x.owner.op.set_instead_of_inc:
             return
-        if x.owner.inputs[2] == node.inputs[1] and tuple(x.owner.op.idx_list) == tuple(node.op.idx_list):
+
+        if x.owner.inputs[2:] == node.inputs[1:] and tuple(x.owner.op.idx_list) == tuple(node.op.idx_list):
             return [x.owner.inputs[1]]
         else:
             return
 
+
 @register_specialize
 @register_canonicalize
 @gof.local_optimizer([Subtensor])

theano/tensor/tests/test_opt.py

@@ -6768,7 +6768,6 @@ if __name__ == '__main__':
     t.setUp()
     # t.test_perform()
     t.test_infer_shape()
-
     """
 #    unittest.main()
     test_fusion().tes_memory_leak()