Skip to content

Commit 7f6cdc3

Browse files
committed
attempt to fix ci
1 parent b8da3ad commit 7f6cdc3

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,6 @@
6767
[submodule "shim"]
6868
path = shim
6969
url = https://github.com/facebook/buck2-shims-meta
70+
[submodule "backends/apple/coreml/third-party/json"]
71+
path = backends/apple/coreml/third-party/json
72+
url = https://github.com/nlohmann/json.git

backends/apple/coreml/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ runtime/inmemoryfs/build/
2020
runtime/test/models/
2121
runtime/sdk/format/
2222
runtime/include/executorch/
23-
third-party/
23+
third-party/coremltools/
24+
third-party/nlohmann_json/
2425

2526
xcode-build/
2627

backends/apple/coreml/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ option(COREML_BUILD_EXECUTOR_RUNNER "Build CoreML executor runner." OFF)
2929
set(INMEMORYFS_SOURCES
3030
runtime/inmemoryfs/inmemory_filesystem.cpp
3131
runtime/inmemoryfs/inmemory_filesystem_utils.mm
32+
runtime/inmemoryfs/inmemory_filesystem_utils.cpp
3233
runtime/inmemoryfs/memory_buffer.cpp
3334
runtime/inmemoryfs/memory_stream.cpp
3435
runtime/inmemoryfs/reversed_memory_stream.cpp
@@ -123,13 +124,18 @@ target_include_directories(coreml_util
123124
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
124125
)
125126

127+
# nlohmann/json
128+
set(JSON_BuildTests OFF CACHE INTERNAL "")
129+
add_subdirectory(third-party/json)
130+
126131
# CoreML inmemoryfs
127132
add_library(coreml_inmemoryfs)
128133
target_sources(coreml_inmemoryfs PRIVATE ${INMEMORYFS_SOURCES})
129134
target_include_directories(coreml_inmemoryfs
130135
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
131136
)
132137
target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util)
138+
target_link_libraries(coreml_inmemoryfs PRIVATE nlohmann_json::nlohmann_json)
133139

134140
# Define the delegate library
135141
add_library(coremldelegate)

backends/apple/coreml/scripts/install_requirements.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ PROTOBUF_FILES_DIR_PATH="$COREMLTOOLS_DIR_PATH/build/mlmodel/format/"
2020

2121
cd "$EXECUTORCH_ROOT_PATH"
2222

23-
rm -rf "$COREML_DIR_PATH/third-party"
24-
mkdir "$COREML_DIR_PATH/third-party"
25-
2623
echo "${green}ExecuTorch: Cloning coremltools."
2724
git clone --depth 1 --branch 8.1 "https://github.com/apple/coremltools.git" $COREMLTOOLS_DIR_PATH
2825
cd $COREMLTOOLS_DIR_PATH
Submodule json added at 9cca280

0 commit comments

Comments
 (0)