formt license header

metal/paddle-mobile/paddle-mobile/Common/MetalExtension.swift

-//
-//  MetalExtension.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/2.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Executor.swift

@@ -55,17 +55,8 @@ public class Executor<P: PrecisionType> {
         device = inDevice
         queue = inQueue
         for block in inProgram.programDesc.blocks {
-            for i in 0..<7 {
-                let op = block.ops[i]
-                do {
-                    let op = try OpCreator<P>.shared.creat(device: inDevice, opDesc: op, scope: inProgram.scope)
-                    op.inferShape()
-                    ops.append(op)
-                } catch let error {
-                    throw error
-                }
-            }
-//            for op in block.ops {
+//            for i in 0..<2 {
+//                let op = block.ops[i]
 //                do {
 //                    let op = try OpCreator<P>.shared.creat(device: inDevice, opDesc: op, scope: inProgram.scope)
 //                    op.inferShape()
@@ -74,6 +65,15 @@ public class Executor<P: PrecisionType> {
 //                    throw error
 //                }
 //            }
+            for op in block.ops {
+                do {
+                    let op = try OpCreator<P>.shared.creat(device: inDevice, opDesc: op, scope: inProgram.scope)
+                    op.inferShape()
+                    ops.append(op)
+                } catch let error {
+                    throw error
+                }
+            }
         }
     }
     

metal/paddle-mobile/paddle-mobile/Operators/ConvAddBatchNormReluOp.swift

-//
-//  ConvAddBatchNormReluOp.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/8.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 
@@ -14,7 +20,7 @@ class ConvAddBatchNormReluParam<P: PrecisionType>: OpParam {
         do {
             filter = try ConvAddBatchNormReluParam.inputFilter(paraInputs: opDesc.paraInputs, from: inScope)
             input = try ConvAddBatchNormReluParam.input(inputs: opDesc.inputs, from: inScope)
-            output = try ConvAddBatchNormReluParam.output(outputs: opDesc.outputs, from: inScope)
+            output = try ConvAddBatchNormReluParam.outputOut(outputs: opDesc.outputs, from: inScope)
             stride = try ConvAddBatchNormReluParam.getAttr(key: "strides", attrs: opDesc.attrs)
             paddings = try ConvAddBatchNormReluParam.getAttr(key: "paddings", attrs: opDesc.attrs)
             dilations = try ConvAddBatchNormReluParam.getAttr(key: "dilations", attrs: opDesc.attrs)
@@ -99,4 +105,9 @@ class ConvAddBatchNormReluOp<P: PrecisionType>: Operator<ConvAddBatchNormReluKer
     static func fusionType() -> String {
         return gConvAddBatchNormReluType
     }
+    
+    func delogOutput() {
+        
+    }
+    
 }

metal/paddle-mobile/paddle-mobile/Operators/ConvAddOp.swift

-//
-//  ConvAddBatchNormReluOp.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/8.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 
@@ -14,7 +20,7 @@ class ConvAddParam<P: PrecisionType>: OpParam {
         do {
             filter = try ConvAddParam.inputFilter(paraInputs: opDesc.paraInputs, from: inScope)
             input = try ConvAddParam.input(inputs: opDesc.inputs, from: inScope)
-            output = try ConvAddParam.output(outputs: opDesc.outputs, from: inScope)
+            output = try ConvAddParam.outputOut(outputs: opDesc.outputs, from: inScope)
             stride = try ConvAddParam.getAttr(key: "strides", attrs: opDesc.attrs)
             paddings = try ConvAddParam.getAttr(key: "paddings", attrs: opDesc.attrs)
             dilations = try ConvAddParam.getAttr(key: "dilations", attrs: opDesc.attrs)

metal/paddle-mobile/paddle-mobile/Operators/Kernels/BatchNormKernel.swift

-//
-//  BatchNormKernel.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/5.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ConvAddBatchNormReluKernel.swift

-//
-//  ConvKernel.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/5.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 
@@ -64,4 +70,6 @@ class ConvAddBatchNormReluKernel<P: PrecisionType>: Kernel, Computable {
         encoder.dispatch(computePipline: pipline, outTexture: param.output.metalTexture)
         encoder.endEncoding()
     }
+    
+    
 }

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ConvAddKernel.swift

-//
-//  ConvKernel.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/5.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ConvKernel.metal

-//
-//  ConvKernel.metal
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/7.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 #include <metal_stdlib>
 using namespace metal;

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ConvKernel.swift

-//
-//  ConvKernel.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/5.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/Kernels/ElementwiseAddKernel.swift

-//
-//  ElementwiseAddKernel.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/5.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/Kernels/Texture2DTo2DArrayKernel.swift

-//
-//  Texture2DTo2DArrayKernel.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/6.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/PoolOp.swift

-//
-//  PoolOp.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/9.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/ReshapeOp.swift

-//
-//  PoolOp.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/9.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Operators/SoftmaxOp.swift

-//
-//  PoolOp.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/9.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 

metal/paddle-mobile/paddle-mobile/Program/OpDesc.swift

@@ -17,7 +17,7 @@ import Foundation
 struct OpDesc {
     let inputs: [String : [String]]
     var paraInputs: [String : [String]]
-    let outputs: [String : [String]]
+    var outputs: [String : [String]]
     let unusedOutputs: [String : [String]]
     var attrs: [String : Attr] = [:]
     var type: String

metal/paddle-mobile/paddle-mobile/Program/ProgramOptimize.swift

-//
-//  ProgramOptimize.swift
-//  paddle-mobile
-//
-//  Created by liuRuiLong on 2018/7/8.
-//  Copyright © 2018年 orange. All rights reserved.
-//
+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. */
 
 import Foundation
 
@@ -56,6 +62,7 @@ class Node {
         let change = fusion.change()
         let inOutputs = outputs
         outputs.removeAll()
+        opDesc?.outputs.removeAll()
         for i in 0..<inOutputs.count {
             inOutputs[i].folderWith(beginNode: self, matchNode: fusionNode.outputs[i], change: change, removedNodes: &removedNodes)
         }
@@ -89,6 +96,8 @@ class Node {
         
         if matchNode.outputs.count == 0 {
             beginNode.outputs.append(contentsOf: outputs)
+            beginNode.opDesc?.outputs = inOpdesc.outputs
+            
         }
         removedNodes.append(self)
         
@@ -158,7 +167,6 @@ class ProgramOptimize<P: PrecisionType> {
                                 _ = inputNode --> node
                             }
                         }
-                        
                     }
                 }
                 
@@ -193,7 +201,6 @@ class ProgramOptimize<P: PrecisionType> {
                                 nodes.remove(element: removeNode)
                             }
                         }
-                        
                     }
                 }
             }

metal/paddle-mobile/paddle-mobile/framework/Tensor.swift

@@ -148,18 +148,25 @@ class Tensor<P: PrecisionType>: Tensorial {
 extension Tensor {
     var debugDescription: String {
         var str = ""
-        str += "Dim: \(dim) \n value:[ "
-        if data.size < 20 {
-            for d in 0..<data.size {
-                str += " \(data[d]) "
-            }
-        } else {
-            for d in stride(from: 0, to: data.size, by: data.size/20) {
-                str += " \(data[d]) "
-            }
-        }
-        str += " ]"
+        
+//        for i in 0..<buffer.length/MemoryLayout<P>.stride {
+//            str += " \(buffer.contents().assumingMemoryBound(to: P.self)[i])"
+//        }
         return str
+        
+//        var str = ""
+//        str += "Dim: \(dim) \n value:[ "
+//        if data.size < 20 {
+//            for d in 0..<data.size {
+//                str += " \(data[d]) "
+//            }
+//        } else {
+//            for d in stride(from: 0, to: data.size, by: data.size/20) {
+//                str += " \(data[d]) "
+//            }
+//        }
+//        str += " ]"
+//        return str
     }
     
     var description: String {