update usage

Author: jathu

backends/apple/coreml/TARGETS

@@ -23,7 +23,7 @@ runtime.python_library(
     ],
     deps = [
         "fbsource//third-party/pypi/coremltools:coremltools",
-        ":executorchcoreml",
+        ":inmemoryfs_pybinding",
         "//executorch/exir/backend:backend_details",
         "//executorch/exir/backend:compile_spec_schema",
     ],
@@ -59,7 +59,7 @@ runtime.python_library(
 )
 
 runtime.cxx_python_extension(
-    name = "executorchcoreml",
+    name = "inmemoryfs_pybinding",
     srcs = [
         "runtime/inmemoryfs/inmemory_filesystem.cpp",
         "runtime/inmemoryfs/inmemory_filesystem_py.cpp",
@@ -80,7 +80,7 @@ runtime.cxx_python_extension(
         "-Iexecutorch/backends/apple/coreml/runtime/util",
     ],
     types = [
-        "executorchcoreml.pyi",
+        "inmemoryfs.pyi",
     ],
     visibility = [
         "//executorch/examples/apple/coreml/...",

backends/apple/coreml/compiler/coreml_preprocess.py

@@ -16,8 +16,8 @@
 
 import coremltools as ct
 import coremltools.optimize as cto
-import executorchcoreml
 
+from executorch.backends.apple.coreml import inmemoryfs
 from executorch.exir.backend.backend_details import (
     BackendDetails,
     ExportedProgram,
@@ -385,8 +385,7 @@ def preprocess_model(
             )
 
         processed_bytes: bytes = (
-            executorchcoreml.flatten_directory_contents(str(model_dir_path.resolve()))
-            or b""
+            inmemoryfs.flatten_directory_contents(str(model_dir_path.resolve())) or b""
         )
 
         debug_handle_map: Optional[Dict[str, Tuple[int]]] = None

backends/apple/coreml/executorchcoreml.pyi renamed to backends/apple/coreml/inmemoryfs.pyi

@@ -33,7 +33,7 @@ namespace filesystem = std::experimental::filesystem;
 }
 #endif
 
-namespace executorchcoreml {
+namespace inmemoryfs {
 
 void* alloc_using_mmap(size_t size) {
     return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
@@ -184,9 +184,9 @@ bool unflatten_directory_contents(pybind11::bytes bytes, const std::string& path
 
     return true;
 }
-} // namespace executorchcoreml
+} // namespace inmemoryfs
 
-PYBIND11_MODULE(executorchcoreml, mod) {
-    mod.def("flatten_directory_contents", &executorchcoreml::flatten_directory_contents);
-    mod.def("unflatten_directory_contents", &executorchcoreml::unflatten_directory_contents);
+PYBIND11_MODULE(inmemoryfs, mod) {
+    mod.def("flatten_directory_contents", &inmemoryfs::flatten_directory_contents);
+    mod.def("unflatten_directory_contents", &inmemoryfs::unflatten_directory_contents);
 }

backends/apple/coreml/runtime/inmemoryfs/inmemory_filesystem_py.cpp

@@ -62,8 +62,6 @@ if [ $STATUS -ne 0 ]; then
     exit 1
 fi
 
-sh "$COREML_DIR_PATH/scripts/install_inmemoryfs.sh"
-
 echo "${green}ExecuTorch: Copying protobuf files."
 mkdir -p "$COREML_DIR_PATH/runtime/sdk/format/"
 cp -rf "$PROTOBUF_FILES_DIR_PATH" "$COREML_DIR_PATH/runtime/sdk/format/"

backends/apple/coreml/runtime/inmemoryfs/setup.py

@@ -10,12 +10,9 @@
 
 from typing import List, Optional
 
-import executorchcoreml
-
+from executorch.backends.apple.coreml import inmemoryfs
 from executorch.backends.apple.coreml.compiler import CoreMLBackend
-
 from executorch.exir._serialize._program import deserialize_pte_binary
-
 from executorch.exir.schema import (
     BackendDelegate,
     BackendDelegateDataReference,
@@ -50,7 +47,7 @@ def extract_coreml_models(pte_data: bytes):
             shutil.rmtree(model_path.absolute())
         os.makedirs(model_path.absolute())
 
-        if executorchcoreml.unflatten_directory_contents(
+        if inmemoryfs.unflatten_directory_contents(
             coreml_processed_bytes, str(model_path.absolute())
         ):
             print(f"Core ML models are extracted and saved to path = {model_path}")

backends/apple/coreml/scripts/install_inmemoryfs.sh

@@ -680,6 +680,12 @@ def run(self):
             # add entries like `-DEXECUTORCH_BUILD_XNNPACK=ON` to the CMAKE_ARGS
             # environment variable.
 
+        if ShouldBuild.coreml():
+            cmake_args += [
+                "-DEXECUTORCH_BUILD_COREML=ON",
+            ]
+            build_args += ["--target", "coreml_inmemoryfs_pybinding"]
+
         if ShouldBuild.llama_custom_ops():
             cmake_args += [
                 "-DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON",  # add llama sdpa ops to pybindings.
@@ -786,7 +792,7 @@ def get_ext_modules() -> List[Extension]:
             ]
         )
 
-    if ShouldBuild.pybindings() or ShouldBuild.coreml():
+    if ShouldBuild.coreml():
         ext_modules.append(
             BuiltExtension(
                 src="coreml_inmemoryfs_pybinding.*",