002a9d5d2b2c26fff63293e3007ede9ab7dee616,keras/layers/core.py,Merge,output_shape,#Merge#,333

Before Change

            shape = shape1 + shape2[1:]
            if len(shape) == 1:
                shape.append(1)
            return tuple(shape)
        elif self.mode == "cos":
            return tuple(input_shapes[0][0], 1)

    def get_params(self):

After Change

            tensordot_output = np.tensordot(np.zeros(tuple(shape1[1:])),
                                            np.zeros(tuple(shape2[1:])),
                                            axes=dot_axes)
            if len(tensordot_output.shape) == 0:
                shape = (1,)
            else:
                shape = tensordot_output.shape
            return (shape1[0],) + shape
        elif self.mode == "cos":
            return tuple(input_shapes[0][0], 1)

Instances