Revert "attempt to fix ci"

This reverts commit a03a108.

Author: jathu

.gitmodules

@@ -67,6 +67,3 @@
 [submodule "shim"]
 	path = shim
 	url = https://github.com/facebook/buck2-shims-meta
-[submodule "backends/apple/coreml/third-party/json"]
-	path = backends/apple/coreml/third-party/json
-	url = https://github.com/nlohmann/json.git

backends/apple/coreml/.gitignore

@@ -20,8 +20,7 @@ runtime/inmemoryfs/build/
 runtime/test/models/
 runtime/sdk/format/
 runtime/include/executorch/
-third-party/coremltools/
-third-party/nlohmann_json/
+third-party/
 
 xcode-build/
 

backends/apple/coreml/CMakeLists.txt

@@ -29,7 +29,6 @@ option(COREML_BUILD_EXECUTOR_RUNNER "Build CoreML executor runner." OFF)
 set(INMEMORYFS_SOURCES
     runtime/inmemoryfs/inmemory_filesystem.cpp
     runtime/inmemoryfs/inmemory_filesystem_utils.mm
-    runtime/inmemoryfs/inmemory_filesystem_utils.cpp
     runtime/inmemoryfs/memory_buffer.cpp
     runtime/inmemoryfs/memory_stream.cpp
     runtime/inmemoryfs/reversed_memory_stream.cpp
@@ -123,25 +122,14 @@ target_sources(coreml_util PRIVATE ${UTIL_SOURCES})
 target_include_directories(coreml_util
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
 )
-set(TARGET coreml_util
-    APPEND_STRING PROPERTY COMPILE_FLAGS "-x objective-c++"
-)
-
-# nlohmann/json
-set(JSON_BuildTests OFF CACHE INTERNAL "")
-add_subdirectory(third-party/json)
 
 # CoreML inmemoryfs
 add_library(coreml_inmemoryfs)
 target_sources(coreml_inmemoryfs PRIVATE ${INMEMORYFS_SOURCES})
 target_include_directories(coreml_inmemoryfs
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
 )
-set(TARGET coreml_inmemoryfs
-    APPEND_STRING PROPERTY COMPILE_FLAGS "-x objective-c++"
-)
 target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util)
-target_link_libraries(coreml_inmemoryfs PRIVATE nlohmann_json::nlohmann_json)
 
 # Define the delegate library
 add_library(coremldelegate)

backends/apple/coreml/scripts/install_requirements.sh

@@ -20,6 +20,9 @@ PROTOBUF_FILES_DIR_PATH="$COREMLTOOLS_DIR_PATH/build/mlmodel/format/"
 
 cd "$EXECUTORCH_ROOT_PATH"
 
+rm -rf "$COREML_DIR_PATH/third-party"
+mkdir "$COREML_DIR_PATH/third-party"
+
 echo "${green}ExecuTorch: Cloning coremltools."
 git clone --depth 1 --branch 8.1 "https://github.com/apple/coremltools.git" $COREMLTOOLS_DIR_PATH
 cd $COREMLTOOLS_DIR_PATH