File tree Expand file tree Collapse file tree 5 files changed +12
-4
lines changed Expand file tree Collapse file tree 5 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 67
67
[submodule "shim "]
68
68
path = shim
69
69
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
Original file line number Diff line number Diff line change @@ -20,7 +20,8 @@ runtime/inmemoryfs/build/
20
20
runtime /test /models /
21
21
runtime /sdk /format /
22
22
runtime /include /executorch /
23
- third-party /
23
+ third-party /coremltools /
24
+ third-party /nlohmann_json /
24
25
25
26
xcode-build /
26
27
Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ option(COREML_BUILD_EXECUTOR_RUNNER "Build CoreML executor runner." OFF)
29
29
set (INMEMORYFS_SOURCES
30
30
runtime/inmemoryfs/inmemory_filesystem.cpp
31
31
runtime/inmemoryfs/inmemory_filesystem_utils.mm
32
+ runtime/inmemoryfs/inmemory_filesystem_utils.cpp
32
33
runtime/inmemoryfs/memory_buffer.cpp
33
34
runtime/inmemoryfs/memory_stream.cpp
34
35
runtime/inmemoryfs/reversed_memory_stream.cpp
@@ -123,13 +124,18 @@ target_include_directories(coreml_util
123
124
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} /runtime/util
124
125
)
125
126
127
+ # nlohmann/json
128
+ set (JSON_BuildTests OFF CACHE INTERNAL "" )
129
+ add_subdirectory (third-party/json )
130
+
126
131
# CoreML inmemoryfs
127
132
add_library (coreml_inmemoryfs )
128
133
target_sources (coreml_inmemoryfs PRIVATE ${INMEMORYFS_SOURCES} )
129
134
target_include_directories (coreml_inmemoryfs
130
135
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} /runtime/inmemoryfs
131
136
)
132
137
target_link_libraries (coreml_inmemoryfs PRIVATE coreml_util )
138
+ target_link_libraries (coreml_inmemoryfs PRIVATE nlohmann_json::nlohmann_json )
133
139
134
140
# Define the delegate library
135
141
add_library (coremldelegate )
Original file line number Diff line number Diff line change @@ -20,9 +20,6 @@ PROTOBUF_FILES_DIR_PATH="$COREMLTOOLS_DIR_PATH/build/mlmodel/format/"
20
20
21
21
cd " $EXECUTORCH_ROOT_PATH "
22
22
23
- rm -rf " $COREML_DIR_PATH /third-party"
24
- mkdir " $COREML_DIR_PATH /third-party"
25
-
26
23
echo " ${green} ExecuTorch: Cloning coremltools."
27
24
git clone --depth 1 --branch 8.1 " https://github.com/apple/coremltools.git" $COREMLTOOLS_DIR_PATH
28
25
cd $COREMLTOOLS_DIR_PATH
You can’t perform that action at this time.
0 commit comments