Change the API to mutate passed in keyValues (as "consume").

Author: liuliu

WORKSPACE

@@ -5,9 +5,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 git_repository(
     name = "ccv",
-    commit = "479c846ca1aff4a313ef0d632f03e05f800f13ea",
+    commit = "6fd6af5eb258e8bbf22daa02f81a7f900cffe0be",
     remote = "https://github.com/liuliu/ccv.git",
-    shallow_since = "1746828831 -0400",
+    shallow_since = "1746841166 -0400",
 )
 
 load("@ccv//config:ccv.bzl", "ccv_deps", "ccv_setting")

nnc/Model.swift

@@ -200,23 +200,29 @@ public class Model: AnyModel {
     /**
      * Move the backing tensor into the parameters. Making the original one invalid afterwards.
      */
-    public func attach(consuming keyValues: [(key: String, value: AnyTensor)]) {
+    public func attach(consuming keyValues: inout [(key: String, value: AnyTensor)]) {
       let keys = keyValues.map { $0.key.utf8CString }
       let values = keyValues.map(\.value)
-      withExtendedLifetime(keys) { keys in
+      // Once we attached, we remove all the keyValues that are consumed.
+      keyValues = withExtendedLifetime(keys) { keys in
         withExtendedLifetime(values) { values in
           var cTensors: [UnsafeMutablePointer<ccv_nnc_tensor_t>?] = values.map { $0.cTensor }
           var cKeys: [UnsafeMutablePointer<CChar>?] = keys.map {
             $0.withUnsafeBufferPointer { $0.baseAddress.map { UnsafeMutablePointer(mutating: $0) } }
           }
-          cKeys.withUnsafeMutableBufferPointer { cKeys in
+          return cKeys.withUnsafeMutableBufferPointer { cKeys in
             cTensors.withUnsafeMutableBufferPointer { cTensors in
               ccv_cnnp_model_set_parameters_from_key_values(
                 model!.cModel, cKeys.baseAddress, cTensors.baseAddress, Int32(keyValues.count), 1)
+              var newKeyValues = [(key: String, value: AnyTensor)]()
               for (i, value) in values.enumerated() {
-                guard cTensors[i] == nil else { continue }
+                guard cTensors[i] == nil else {
+                  newKeyValues.append(keyValues[i])
+                  continue
+                }
                 value.consume()
               }
+              return newKeyValues
             }
           }
         }