Adding GraphDefOptions.setUniquify(names, prefix).

Also allowing local cache on apple/swift-protobuf.

Author: RockfordWei

Package.swift

@@ -20,6 +20,16 @@
 //
 
 import PackageDescription
+#if os(OSX)
+import Darwin
+#else
+import Glibc
+#endif
+
+var url = "https://github.com/apple/swift-protobuf.git"
+if let cache = getenv("URL_PERFECT"), let local = String(validatingUTF8: cache) {
+  url = "\(local)/swift-protobuf/.git"
+}
 
 let package = Package(
     name: "PerfectTensorFlow",
@@ -29,7 +39,7 @@ let package = Package(
             targets: ["PerfectTensorFlow"]),
     ],
     dependencies: [
-      .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.0.0")
+      .package(url: url, from: "1.0.0")
     ],
     targets: [
         .target(

Sources/PerfectTensorFlow/APILoader.swift

@@ -929,6 +929,23 @@ public class TFLib {
   // Deleting a function does not remove it from any graphs it was copied to.
   public static var DeleteFunction: @convention(c) (OpaquePointer?) -> Void = { _ in }
 
+  // Set whether to uniquify imported operation names. If true, imported operation
+  // names will be modified if their name already exists in the graph. If false,
+  // conflicting names will be treated as an error. Note that this option has no
+  // effect if a prefix is set, since the prefix will guarantee all names are
+  // unique. Defaults to false.
+  //TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsSetUniquifyNames(
+  //TF_ImportGraphDefOptions* opts, unsigned char uniquify_names);
+  public static var ImportGraphDefOptionsSetUniquifyNames: @convention(c) (OpaquePointer, UInt8) -> Void = { _, _ in }
+
+  // If true, the specified prefix will be modified if it already exists as an
+  // operation name or prefix in the graph. If false, a conflicting prefix will be
+  // treated as an error. This option has no effect if no prefix is specified.
+  // TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsSetUniquifyPrefix(
+  // TF_ImportGraphDefOptions* opts, unsigned char uniquify_prefix);
+  public static var ImportGraphDefOptionsSetUniquifyPrefix: @convention(c) (OpaquePointer, UInt8) -> Void = { _, _ in }
+
+
   /// Bootstrap of tensorflow library open, **MUST BE CALL BEFORE ANY OPERATIONS**
   /// - parameters
   ///   - library: the installation path of library TensorFlow for C, /usr/local/lib/libtensorflow.so by default
@@ -950,6 +967,11 @@ public class TFLib {
       throw Panic.DLL(reason: "Version \(ver) is obsolete and out of support.")
     }
 
+    if ver >= "1.4.1" {
+      ImportGraphDefOptionsSetUniquifyNames = try LoadFunction(lib, "TF_ImportGraphDefOptionsSetUniquifyNames")
+      ImportGraphDefOptionsSetUniquifyPrefix = try LoadFunction(lib, "TF_ImportGraphDefOptionsSetUniquifyPrefix")
+    }
+
     if ver >= "1.4.0" {
       GraphCopyFunction = try LoadFunction(lib, "TF_GraphCopyFunction")
       GraphToFunction = try LoadFunction(lib, "TF_GraphToFunction")

Sources/PerfectTensorFlow/PerfectTensorFlow.swift

@@ -2040,6 +2040,14 @@ public class TensorFlow {
       TFLib.DeleteImportGraphDefOptions(options)
     }//end init
 
+    public func setNames(uniquified: Bool = false) {
+      TFLib.ImportGraphDefOptionsSetUniquifyNames(options, uniquified ? 1 : 0)
+    }
+
+    public func setPrefix(uniquified: Bool = false) {
+      TFLib.ImportGraphDefOptionsSetUniquifyPrefix(options, uniquified ? 1 : 0)
+    }
+
     /// Set the prefix to be prepended to the names of nodes in graph_def that will be imported into graph.
     /// - parameters:
     ///   - prefix: the prefix to add to all the names of nodes.