update usage

Author: jathu

CMakeLists.txt

@@ -811,7 +811,7 @@ if(EXECUTORCH_BUILD_PYBIND)
 
   if(EXECUTORCH_BUILD_COREML)
     list(APPEND _dep_libs coremldelegate)
-    list(APPEND _dep_libs coreml_inmemoryfs_pybinding)
+    list(APPEND _dep_libs executorchcoreml)
   endif()
 
   if(EXECUTORCH_BUILD_MPS)
@@ -936,7 +936,7 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
 
   if(EXECUTORCH_BUILD_COREML)
     list(APPEND _executor_runner_libs coremldelegate)
-    list(APPEND _executor_runner_libs coreml_inmemoryfs_pybinding)
+    list(APPEND _executor_runner_libs executorchcoreml)
   endif()
 
   add_executable(executor_runner ${_executor_runner__srcs})

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 executorchcoreml
 from executorch.exir.backend.backend_details import (
     BackendDetails,
     ExportedProgram,

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

@@ -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/scripts/install_inmemoryfs.sh

@@ -10,12 +10,9 @@
 
 from typing import List, Optional
 
-import executorchcoreml
-
+from executorch.backends.apple.coreml import executorchcoreml
 from executorch.backends.apple.coreml.compiler import CoreMLBackend
-
 from executorch.exir._serialize._program import deserialize_pte_binary
-
 from executorch.exir.schema import (
     BackendDelegate,
     BackendDelegateDataReference,

backends/apple/coreml/scripts/install_requirements.sh

@@ -187,7 +187,9 @@ def handle_pybind(args, cmake_args, executorch_build_pybind):
             elif pybind_arg == "mps":
                 cmake_args += " -DEXECUTORCH_BUILD_MPS=ON"
             else:
-                cmake_args += f" -DEXECUTORCH_BUILD_{pybind_arg.upper()}=ON"
+                name = f"EXECUTORCH_BUILD_{pybind_arg.upper()}"
+                cmake_args += f" -D{name}=ON"
+                os.environ[name] = "ON"
             executorch_build_pybind = "ON"
     return executorch_build_pybind, cmake_args
 

examples/apple/coreml/scripts/extract_coreml_models.py

@@ -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", "executorchcoreml"]
+
         if ShouldBuild.llama_custom_ops():
             cmake_args += [
                 "-DEXECUTORCH_BUILD_KERNELS_CUSTOM=ON",  # add llama sdpa ops to pybindings.
@@ -786,12 +792,12 @@ def get_ext_modules() -> List[Extension]:
             ]
         )
 
-    if ShouldBuild.pybindings() or ShouldBuild.coreml():
+    if ShouldBuild.coreml():
         ext_modules.append(
             BuiltExtension(
-                src="coreml_inmemoryfs_pybinding.*",
+                src="executorchcoreml.*",
                 src_dir="backends/apple/coreml",
-                modpath="executorch.backends.apple.coreml.inmemoryfs",
+                modpath="executorch.backends.apple.coreml.executorchcoreml",
             )
         )