Add encode function and move run functions

Author: christiangnrd

lib/mpsgraphs/MPSGraphs.jl

@@ -41,6 +41,7 @@ include("libmpsgraph.jl")
 
 include("core.jl")
 include("tensor.jl")
+include("execution.jl")
 include("operations.jl")
 include("random.jl")
 

lib/mpsgraphs/core.jl

@@ -26,3 +26,7 @@ function MPSGraphDevice(device::MTLDevice)
     obj = @objc [MPSGraphDevice deviceWithMTLDevice:device::id{MTLDevice}]::id{MPSGraphDevice}
     MPSGraphDevice(obj)
 end
+
+function MPSGraphExecutionDescriptor()
+    MPSGraphExecutionDescriptor(@objc [MPSGraphExecutionDescriptor new]::id{MPSGraphExecutionDescriptor})
+end

lib/mpsgraphs/execution.jl

@@ -0,0 +1,34 @@
+
+MPS.encode!(commandBuffer::MPSCommandBuffer, graph::MPSGraph, feeds::MPSGraphTensorDataDictionary, resultsDictionary::MPSGraphTensorDataDictionary) = @inline MPS.encode!(commandBuffer, graph, feeds, nil, resultsDictionary, MPSGraphExecutionDescriptor())
+function MPS.encode!(commandBuffer::MPSCommandBuffer, graph::MPSGraph, feeds::MPSGraphTensorDataDictionary, targetOperations, resultsDictionary::MPSGraphTensorDataDictionary, executionDescriptor)
+    @objc [graph::id{MPSGraph} encodeToCommandBuffer:commandBuffer::id{MPSCommandBuffer}
+                                                  feedss:feeds::id{MPSGraphTensorDataDictionary}
+                                       targetOperations:targetOperations::id{Object}
+                                      resultsDictionary:resultsDictionary::id{MPSGraphTensorDataDictionary}
+                                    executionDescriptor:executionDescriptor::id{MPSGraphExecutionDescriptor}]::Nothing
+    return resultsDictionary
+end
+
+function MPS.encode!(commandBuffer::MPSCommandBuffer, graph::MPSGraph, feeds::MPSGraphTensorDataDictionary, targetTensors::NSArray, targetOperations=nil, executionDescriptor=MPSGraphExecutionDescriptor())
+    obj = @objc [graph::id{MPSGraph} encodeToCommandBuffer:commandBuffer::id{MPSCommandBuffer}
+                                                        feeds:feeds::id{MPSGraphTensorDataDictionary}
+                                                targetTensors:targetTensors::id{NSArray}
+                                             targetOperations:targetOperations::id{Object}
+                                          executionDescriptor:executionDescriptor::id{MPSGraphExecutionDescriptor}]::id{MPSGraphTensorDataDictionary}
+    MPSGraphTensorDataDictionary(obj)
+end
+
+function run(graph::MPSGraph, feeds::MPSGraphTensorDataDictionary, targetTensors::NSArray, targetOperations=nil)
+    obj = @objc [graph::id{MPSGraph} runWithFeeds:feeds::id{MPSGraphTensorDataDictionary}
+                                            targetTensors:targetTensors::id{NSArray}
+                                         targetOperations:targetOperations::id{Object}]::id{MPSGraphTensorDataDictionary}
+    MPSGraphTensorDataDictionary(obj)
+end
+
+function run(graph::MPSGraph, commandQueue::MTLCommandQueue, feeds::MPSGraphTensorDataDictionary, targetTensors::NSArray)
+    obj = @objc [graph::id{MPSGraph} runWithMTLCommandQueue:commandQueue::id{MTLCommandQueue}
+                                                    feeds:feeds::id{MPSGraphTensorDataDictionary}
+                                            targetTensors:targetTensors::id{NSArray}
+                                         targetOperations:nil::id{Object}]::id{MPSGraphTensorDataDictionary}
+    MPSGraphTensorDataDictionary(obj)
+end

lib/mpsgraphs/operations.jl

@@ -45,20 +45,3 @@ function identityWithTensor(graph::MPSGraph, tensor::MPSGraphTensor, name = "ide
                                 name:name::id{NSString}]::id{MPSGraphTensor}
     MPSGraphTensor(obj)
 end
-
-run(graph::MPSGraph, feeds::Dict, targetTensors::Vector) = run(graph, MPSGraphTensorDataDictionary(feeds), NSArray(targetTensors))
-function run(graph::MPSGraph, feeds::MPSGraphTensorDataDictionary, targetTensors::NSArray)
-    obj = @objc [graph::id{MPSGraph} runWithFeeds:feeds::id{MPSGraphTensorDataDictionary}
-                                            targetTensors:targetTensors::id{NSArray}
-                                         targetOperations:nil::id{Object}]::id{MPSGraphTensorDataDictionary}
-    MPSGraphTensorDataDictionary(obj)
-end
-
-run(graph::MPSGraph, commandQueue::MTLCommandQueue, feeds::Dict, targetTensors::Vector) = run(graph, commandQueue, MPSGraphTensorDataDictionary(feeds), NSArray(targetTensors))
-function run(graph::MPSGraph, commandQueue::MTLCommandQueue, feeds::MPSGraphTensorDataDictionary, targetTensors::NSArray)
-    obj = @objc [graph::id{MPSGraph} runWithMTLCommandQueue:commandQueue::id{MTLCommandQueue}
-                                                    feeds:feeds::id{MPSGraphTensorDataDictionary}
-                                            targetTensors:targetTensors::id{NSArray}
-                                         targetOperations:nil::id{Object}]::id{MPSGraphTensorDataDictionary}
-    MPSGraphTensorDataDictionary(obj)
-end