update usage

Author: jathu

CMakeLists.txt

@@ -811,7 +811,6 @@ if(EXECUTORCH_BUILD_PYBIND)
 
   if(EXECUTORCH_BUILD_COREML)
     list(APPEND _dep_libs coremldelegate)
-    list(APPEND _dep_libs coreml_inmemoryfs_pybinding)
   endif()
 
   if(EXECUTORCH_BUILD_MPS)
@@ -936,7 +935,6 @@ if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)
 
   if(EXECUTORCH_BUILD_COREML)
     list(APPEND _executor_runner_libs coremldelegate)
-    list(APPEND _executor_runner_libs coreml_inmemoryfs_pybinding)
   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

@@ -45,15 +45,6 @@ mkdir "$COREMLTOOLS_DIR_PATH/build"
 cmake -S "$COREMLTOOLS_DIR_PATH" -B "$COREMLTOOLS_DIR_PATH/build"
 cmake --build "$COREMLTOOLS_DIR_PATH/build" --parallel
 
-echo "${green}ExecuTorch: Installing coremltools."
-pip install "$COREMLTOOLS_DIR_PATH"
-
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
-    echo "${red}ExecuTorch: Failed to install coremltools."
-    exit 1
-fi
-
 echo "${green}ExecuTorch: Cloning nlohmann."
 git clone https://github.com/nlohmann/json.git "$COREML_DIR_PATH/third-party/nlohmann_json"
 STATUS=$?
@@ -62,8 +53,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

@@ -67,6 +67,8 @@ dependencies=[
   "sympy",
   "tabulate",
   "typing-extensions",
+  # macOS Only
+  "coremltools==8.1; platform_system == 'Darwin'",
 ]
 
 [project.urls]

examples/apple/coreml/scripts/extract_coreml_models.py

@@ -84,6 +84,10 @@ def _cmake_args_defines() -> Dict[str, str]:
     return result
 
 
+def _is_macos() -> bool:
+    return sys.platform == "darwin"
+
+
 class ShouldBuild:
     """Indicates whether to build various components."""
 
@@ -125,7 +129,7 @@ def pybindings(cls) -> bool:
 
     @classmethod
     def coreml(cls) -> bool:
-        return cls._is_cmake_arg_enabled("EXECUTORCH_BUILD_COREML", default=False)
+        return cls._is_cmake_arg_enabled("EXECUTORCH_BUILD_COREML", default=_is_macos())
 
     @classmethod
     def mps(cls) -> bool:
@@ -135,10 +139,6 @@ def mps(cls) -> bool:
     def xnnpack(cls) -> bool:
         return cls._is_cmake_arg_enabled("EXECUTORCH_BUILD_XNNPACK", default=False)
 
-    @classmethod
-    def coreml(cls) -> bool:
-        return cls._is_env_enabled("EXECUTORCH_BUILD_COREML", default=False)
-
     @classmethod
     def training(cls) -> bool:
         return cls._is_cmake_arg_enabled(
@@ -724,8 +724,14 @@ def run(self):
                 "-DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON",  # add quantized ops to pybindings.
                 "-DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON",
             ]
+
             if ShouldBuild.training():
                 build_args += ["--target", "_training_lib"]
+
+            if ShouldBuild.coreml():
+                cmake_args += ["-DEXECUTORCH_BUILD_COREML=ON"]
+                build_args += ["--target", "executorchcoreml"]
+
             build_args += ["--target", "portable_lib"]
             # To link backends into the portable_lib target, callers should
             # add entries like `-DEXECUTORCH_BUILD_XNNPACK=ON` to the CMAKE_ARGS
@@ -837,15 +843,6 @@ def get_ext_modules() -> List[Extension]:
             ]
         )
 
-    if ShouldBuild.pybindings() or ShouldBuild.coreml():
-        ext_modules.append(
-            BuiltExtension(
-                src="coreml_inmemoryfs_pybinding.*",
-                src_dir="backends/apple/coreml",
-                modpath="executorch.backends.apple.coreml.inmemoryfs",
-            )
-        )
-
     if ShouldBuild.pybindings():
         ext_modules.append(
             # Install the prebuilt pybindings extension wrapper for the runtime,
@@ -868,6 +865,14 @@ def get_ext_modules() -> List[Extension]:
                     "executorch.extension.training.pybindings._training_lib",
                 )
             )
+        if ShouldBuild.coreml():
+            ext_modules.append(
+                BuiltExtension(
+                    src="executorchcoreml.*",
+                    src_dir="backends/apple/coreml",
+                    modpath="executorch.backends.apple.coreml.executorchcoreml",
+                )
+            )
     if ShouldBuild.llama_custom_ops():
         ext_modules.append(
             BuiltFile(