Optimize memory when exporting.

Author: cymbalrush

backends/apple/coreml/compiler/coreml_preprocess.py

@@ -50,11 +50,11 @@ def to_bytes(mlmodel):
             outfile.write(json_object)
 
         # flatten directory contents and convert it to bytes
-        flattened_bytes = executorchcoreml.flatten_directory_contents(
+        contents = executorchcoreml.flatten_directory_contents(
             str(model_dir_path.resolve())
         )
         shutil.rmtree(str(model_dir_path.resolve()))
-        return flattened_bytes
+        return contents
 
     @classmethod
     # pyre-ignore
@@ -70,7 +70,10 @@ def preprocess(
             pass_pipeline=ct.PassPipeline.DEFAULT,
             skip_model_load=True,
         )
-        flattened_bytes = CoreMLBackend.to_bytes(mlmodel)
-        return PreprocessResult(
-            processed_bytes=flattened_bytes,
+
+        bytes_and_handle = CoreMLBackend.to_bytes(mlmodel)
+        result = PreprocessResult(
+            processed_bytes=bytes_and_handle[0],
         )
+
+        return result

backends/apple/coreml/runtime/delegate/ETCoreMLModelManager.mm

@@ -380,7 +380,7 @@ - (nullable ETCoreMLModel *)loadModelFromData:(NSData *)data
     using namespace inmemoryfs;
 
     auto buffer = MemoryBuffer::make_unowned(const_cast<void *>(data.bytes), data.length);
-    std::unique_ptr<InMemoryFileSystem> inMemoryFS = inmemoryfs::make(buffer);
+    std::unique_ptr<InMemoryFileSystem> inMemoryFS = inmemoryfs::make_inmemory_filesystem(std::move(buffer));
     if (!inMemoryFS) {
         ETCoreMLLogErrorAndSetNSError(error,
                                       ETCoreMLErrorCorruptedModel,

backends/apple/coreml/runtime/delegate/backend_delegate.mm

@@ -64,7 +64,7 @@ MLMultiArrayDataType get_data_type(MultiArray::DataType dataType) {
             return MLMultiArrayDataTypeFloat32;
         }
         case MultiArray::DataType::Double: {
-            return MLMultiArrayDataTypeFloat64;
+            return MLMultiArrayDataTypeDouble;
         }
         case MultiArray::DataType::Int: {
             return MLMultiArrayDataTypeInt32;

backends/apple/coreml/runtime/delegate/coreml_backend_delegate.mm

@@ -135,7 +135,7 @@
     ET_CHECK_OR_RETURN_ERROR(handle != nullptr,
                              InvalidProgram,
                              "%s: Failed to init the model.", ETCoreMLStrings.delegateIdentifier.UTF8String);
-    
+    processed->Free();
     return handle;
 }