Merge pull request #445 from SunAhong1993/paddle-2.0

Paddle 2.0

x2paddle/op_mapper/dygraph/tf2paddle/tf_op_mapper.py

@@ -249,6 +249,15 @@ class TFOpMapper(OpMapper):
             outputs=[node.name],
             perm=perm)
         
+    def Neg(self, node):
+        input = self.graph.get_input_node(node, 0)
+        
+        self.paddle_graph.add_layer(
+            "paddle.scale",
+            inputs={"x": input.name},
+            outputs=[node.name],
+            scale=-1)
+
     def Fill(self, node):
         dims = self.graph.get_input_node(node, 0)
         input_value = self.graph.get_input_node(node, 1)

x2paddle/op_mapper/static/tf2paddle/tf_op_mapper.py

@@ -305,6 +305,15 @@ class TFOpMapper(OpMapper):
                 outputs=[node.name],
                 perm=[0, 2, 3, 1])
             
+    def Neg(self, node):
+        input = self.graph.get_input_node(node, 0)
+        
+        self.paddle_graph.add_layer(
+            "paddle.scale",
+            inputs={"x": input.name},
+            outputs=[node.name],
+            scale=-1)
+
     def MaxPool(self, node):
         input = self.graph.get_node(node.layer.input[0])
 

x2paddle/optimizer/tensorflow/prelu.py

@@ -118,5 +118,5 @@ class PReLUOpt:
                 graph.layers[transpose0.id] = transpose0
                 graph.layers[prelu.id] = prelu
                 graph.layers[transpose1.id] = transpose1
-                graph.parameters[alpha.outputs[0]] = np.expand_dims(graph.parameters[alpha.outputs[0]], axis=(0, 2, 3))
+                graph.parameters[alpha.outputs[0]] = np.reshape(graph.parameters[alpha.outputs[0]], (1, 0, 1, 1))
         graph.build()
\ No newline at end of file