Skip to content

Commit b9ac7c5

Browse files
metascroymetascroy
committed
up
1 parent b83ddb3 commit b9ac7c5

File tree

4 files changed

+47
-44
lines changed

4 files changed

+47
-44
lines changed

‎backends/apple/coreml/runtime/workspace/executorchcoreml.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
/* Begin PBXBuildFile section */
1010
8307EB8A2C9262060011AE6D /* state_coreml_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = 8307EB892C9262060011AE6D /* state_coreml_all.pte */; };
11-
838CA6872CD1965700462190 /* add_mul_coreml_float16_all_compiled.pte in Resources */ = {isa = PBXBuildFile; fileRef = 838CA6862CD1965700462190 /* add_mul_coreml_float16_all_compiled.pte */; };
11+
838CA6872CD1965700462190 /* add_mul_compiled_coreml_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = 838CA6862CD1965700462190 /* add_mul_compiled_coreml_all.pte */; };
1212
83BB78A02C65DA7300274ED7 /* ETCoreMLModelDebugInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83BB789F2C65DA7300274ED7 /* ETCoreMLModelDebugInfo.mm */; };
13-
83BB78BF2C66AAAE00274ED7 /* add_mul_coreml_float16_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = 83BB78BD2C66AAAE00274ED7 /* add_mul_coreml_float16_all.bin */; };
14-
83BB78C02C66AAAE00274ED7 /* add_mul_coreml_float16_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = 83BB78BE2C66AAAE00274ED7 /* add_mul_coreml_float16_all.pte */; };
13+
83BB78BF2C66AAAE00274ED7 /* add_mul_coreml_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = 83BB78BD2C66AAAE00274ED7 /* add_mul_coreml_all.bin */; };
14+
83BB78C02C66AAAE00274ED7 /* add_mul_coreml_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = 83BB78BE2C66AAAE00274ED7 /* add_mul_coreml_all.pte */; };
1515
C945E8E02B997ECE009C3FAC /* ETCoreMLModelProfiler.mm in Sources */ = {isa = PBXBuildFile; fileRef = C945E8CF2B997ECD009C3FAC /* ETCoreMLModelProfiler.mm */; };
1616
C945E8E12B997ECE009C3FAC /* ETCoreMLModelAnalyzer.mm in Sources */ = {isa = PBXBuildFile; fileRef = C945E8D42B997ECD009C3FAC /* ETCoreMLModelAnalyzer.mm */; };
1717
C945E8E22B997ECE009C3FAC /* program_path.mm in Sources */ = {isa = PBXBuildFile; fileRef = C945E8D52B997ECD009C3FAC /* program_path.mm */; };
@@ -85,12 +85,12 @@
8585
C97716D52AF41B2E00FC0DAC /* json_key_value_store.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C97716D42AF41B2E00FC0DAC /* json_key_value_store.cpp */; };
8686
C97716DA2AF44CFA00FC0DAC /* json_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C97716D82AF44CFA00FC0DAC /* json_util.cpp */; };
8787
C97716DD2AF44E7B00FC0DAC /* objc_json_serde.mm in Sources */ = {isa = PBXBuildFile; fileRef = C97716DC2AF44E7B00FC0DAC /* objc_json_serde.mm */; };
88-
C985519E2AD2542D009143F9 /* mv3_coreml_float16_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = C98551982AD2542D009143F9 /* mv3_coreml_float16_all.pte */; };
89-
C985519F2AD2542D009143F9 /* mul_coreml_float16_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = C98551992AD2542D009143F9 /* mul_coreml_float16_all.bin */; };
90-
C98551A02AD2542D009143F9 /* add_coreml_float16_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = C985519A2AD2542D009143F9 /* add_coreml_float16_all.bin */; };
91-
C98551A12AD2542D009143F9 /* mv3_coreml_float16_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = C985519B2AD2542D009143F9 /* mv3_coreml_float16_all.bin */; };
92-
C98551A22AD2542D009143F9 /* mul_coreml_float16_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = C985519C2AD2542D009143F9 /* mul_coreml_float16_all.pte */; };
93-
C98551A32AD2542D009143F9 /* add_coreml_float16_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = C985519D2AD2542D009143F9 /* add_coreml_float16_all.pte */; };
88+
C985519E2AD2542D009143F9 /* mv3_coreml_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = C98551982AD2542D009143F9 /* mv3_coreml_all.pte */; };
89+
C985519F2AD2542D009143F9 /* mul_coreml_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = C98551992AD2542D009143F9 /* mul_coreml_all.bin */; };
90+
C98551A02AD2542D009143F9 /* add_coreml_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = C985519A2AD2542D009143F9 /* add_coreml_all.bin */; };
91+
C98551A12AD2542D009143F9 /* mv3_coreml_all.bin in Resources */ = {isa = PBXBuildFile; fileRef = C985519B2AD2542D009143F9 /* mv3_coreml_all.bin */; };
92+
C98551A22AD2542D009143F9 /* mul_coreml_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = C985519C2AD2542D009143F9 /* mul_coreml_all.pte */; };
93+
C98551A32AD2542D009143F9 /* add_coreml_all.pte in Resources */ = {isa = PBXBuildFile; fileRef = C985519D2AD2542D009143F9 /* add_coreml_all.pte */; };
9494
C99883862B95AD7D000953A3 /* libprotobuf-lite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C99883852B95AD7D000953A3 /* libprotobuf-lite.a */; };
9595
C99883882B964413000953A3 /* libexecutorch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C99883872B964413000953A3 /* libexecutorch.a */; };
9696
C998838D2B96841D000953A3 /* ETCoreMLModelStructurePathTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = C998838C2B96841D000953A3 /* ETCoreMLModelStructurePathTests.mm */; };
@@ -123,11 +123,11 @@
123123

124124
/* Begin PBXFileReference section */
125125
8307EB892C9262060011AE6D /* state_coreml_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = state_coreml_all.pte; path = ../test/models/state_coreml_all.pte; sourceTree = "<group>"; };
126-
838CA6862CD1965700462190 /* add_mul_coreml_float16_all_compiled.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = add_mul_coreml_float16_all_compiled.pte; path = ../test/models/add_mul_coreml_float16_all_compiled.pte; sourceTree = "<group>"; };
126+
838CA6862CD1965700462190 /* add_mul_compiled_coreml_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = add_mul_compiled_coreml_all.pte; path = ../test/models/add_mul_compiled_coreml_all.pte; sourceTree = "<group>"; };
127127
83BB789E2C65DA7300274ED7 /* ETCoreMLModelDebugInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ETCoreMLModelDebugInfo.h; path = ../sdk/ETCoreMLModelDebugInfo.h; sourceTree = "<group>"; };
128128
83BB789F2C65DA7300274ED7 /* ETCoreMLModelDebugInfo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = ETCoreMLModelDebugInfo.mm; path = ../sdk/ETCoreMLModelDebugInfo.mm; sourceTree = "<group>"; };
129-
83BB78BD2C66AAAE00274ED7 /* add_mul_coreml_float16_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add_mul_coreml_float16_all.bin; path = ../test/models/add_mul_coreml_float16_all.bin; sourceTree = "<group>"; };
130-
83BB78BE2C66AAAE00274ED7 /* add_mul_coreml_float16_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = add_mul_coreml_float16_all.pte; path = ../test/models/add_mul_coreml_float16_all.pte; sourceTree = "<group>"; };
129+
83BB78BD2C66AAAE00274ED7 /* add_mul_coreml_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add_mul_coreml_all.bin; path = ../test/models/add_mul_coreml_all.bin; sourceTree = "<group>"; };
130+
83BB78BE2C66AAAE00274ED7 /* add_mul_coreml_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = add_mul_coreml_all.pte; path = ../test/models/add_mul_coreml_all.pte; sourceTree = "<group>"; };
131131
C945E8CD2B997ECD009C3FAC /* ETCoreMLModelProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ETCoreMLModelProfiler.h; path = ../sdk/ETCoreMLModelProfiler.h; sourceTree = "<group>"; };
132132
C945E8CE2B997ECD009C3FAC /* ETCoreMLModelAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ETCoreMLModelAnalyzer.h; path = ../sdk/ETCoreMLModelAnalyzer.h; sourceTree = "<group>"; };
133133
C945E8CF2B997ECD009C3FAC /* ETCoreMLModelProfiler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ETCoreMLModelProfiler.mm; path = ../sdk/ETCoreMLModelProfiler.mm; sourceTree = "<group>"; };
@@ -259,12 +259,12 @@
259259
C97716DB2AF44D9A00FC0DAC /* objc_json_serde.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = objc_json_serde.h; path = ../util/objc_json_serde.h; sourceTree = "<group>"; };
260260
C97716DC2AF44E7B00FC0DAC /* objc_json_serde.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_json_serde.mm; path = ../util/objc_json_serde.mm; sourceTree = "<group>"; };
261261
C97716DE2AF44FC400FC0DAC /* objc_safe_cast.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = objc_safe_cast.h; path = ../util/objc_safe_cast.h; sourceTree = "<group>"; };
262-
C98551982AD2542D009143F9 /* mv3_coreml_float16_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = mv3_coreml_float16_all.pte; path = ../test/models/mv3_coreml_float16_all.pte; sourceTree = "<group>"; };
263-
C98551992AD2542D009143F9 /* mul_coreml_float16_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = mul_coreml_float16_all.bin; path = ../test/models/mul_coreml_float16_all.bin; sourceTree = "<group>"; };
264-
C985519A2AD2542D009143F9 /* add_coreml_float16_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add_coreml_float16_all.bin; path = ../test/models/add_coreml_float16_all.bin; sourceTree = "<group>"; };
265-
C985519B2AD2542D009143F9 /* mv3_coreml_float16_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = mv3_coreml_float16_all.bin; path = ../test/models/mv3_coreml_float16_all.bin; sourceTree = "<group>"; };
266-
C985519C2AD2542D009143F9 /* mul_coreml_float16_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = mul_coreml_float16_all.pte; path = ../test/models/mul_coreml_float16_all.pte; sourceTree = "<group>"; };
267-
C985519D2AD2542D009143F9 /* add_coreml_float16_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = add_coreml_float16_all.pte; path = ../test/models/add_coreml_float16_all.pte; sourceTree = "<group>"; };
262+
C98551982AD2542D009143F9 /* mv3_coreml_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = mv3_coreml_all.pte; path = ../test/models/mv3_coreml_all.pte; sourceTree = "<group>"; };
263+
C98551992AD2542D009143F9 /* mul_coreml_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = mul_coreml_all.bin; path = ../test/models/mul_coreml_all.bin; sourceTree = "<group>"; };
264+
C985519A2AD2542D009143F9 /* add_coreml_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = add_coreml_all.bin; path = ../test/models/add_coreml_all.bin; sourceTree = "<group>"; };
265+
C985519B2AD2542D009143F9 /* mv3_coreml_all.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = mv3_coreml_all.bin; path = ../test/models/mv3_coreml_all.bin; sourceTree = "<group>"; };
266+
C985519C2AD2542D009143F9 /* mul_coreml_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = mul_coreml_all.pte; path = ../test/models/mul_coreml_all.pte; sourceTree = "<group>"; };
267+
C985519D2AD2542D009143F9 /* add_coreml_all.pte */ = {isa = PBXFileReference; lastKnownFileType = file; name = add_coreml_all.pte; path = ../test/models/add_coreml_all.pte; sourceTree = "<group>"; };
268268
C988D69E2B998D8400979CF6 /* model_event_logger_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = model_event_logger_impl.h; path = ../sdk/model_event_logger_impl.h; sourceTree = "<group>"; };
269269
C988D6FB2B9BA94000979CF6 /* range.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = range.hpp; path = ../inmemoryfs/range.hpp; sourceTree = "<group>"; };
270270
C99883202B92D220000953A3 /* ETCoreMLComputeUnits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ETCoreMLComputeUnits.h; path = ../delegate/ETCoreMLComputeUnits.h; sourceTree = "<group>"; };
@@ -603,15 +603,15 @@
603603
C9E7D7AE2AB6C0C000CCAE5D /* models */ = {
604604
isa = PBXGroup;
605605
children = (
606-
C985519A2AD2542D009143F9 /* add_coreml_float16_all.bin */,
607-
C985519D2AD2542D009143F9 /* add_coreml_float16_all.pte */,
608-
C98551992AD2542D009143F9 /* mul_coreml_float16_all.bin */,
609-
C985519C2AD2542D009143F9 /* mul_coreml_float16_all.pte */,
610-
C985519B2AD2542D009143F9 /* mv3_coreml_float16_all.bin */,
611-
838CA6862CD1965700462190 /* add_mul_coreml_float16_all_compiled.pte */,
612-
C98551982AD2542D009143F9 /* mv3_coreml_float16_all.pte */,
613-
83BB78BD2C66AAAE00274ED7 /* add_mul_coreml_float16_all.bin */,
614-
83BB78BE2C66AAAE00274ED7 /* add_mul_coreml_float16_all.pte */,
606+
C985519A2AD2542D009143F9 /* add_coreml_all.bin */,
607+
C985519D2AD2542D009143F9 /* add_coreml_all.pte */,
608+
C98551992AD2542D009143F9 /* mul_coreml_all.bin */,
609+
C985519C2AD2542D009143F9 /* mul_coreml_all.pte */,
610+
C985519B2AD2542D009143F9 /* mv3_coreml_all.bin */,
611+
838CA6862CD1965700462190 /* add_mul_compiled_coreml_all.pte */,
612+
C98551982AD2542D009143F9 /* mv3_coreml_all.pte */,
613+
83BB78BD2C66AAAE00274ED7 /* add_mul_coreml_all.bin */,
614+
83BB78BE2C66AAAE00274ED7 /* add_mul_coreml_all.pte */,
615615
8307EB892C9262060011AE6D /* state_coreml_all.pte */,
616616
);
617617
name = models;
@@ -676,16 +676,16 @@
676676
isa = PBXResourcesBuildPhase;
677677
buildActionMask = 2147483647;
678678
files = (
679-
C98551A12AD2542D009143F9 /* mv3_coreml_float16_all.bin in Resources */,
680-
C985519F2AD2542D009143F9 /* mul_coreml_float16_all.bin in Resources */,
681-
83BB78BF2C66AAAE00274ED7 /* add_mul_coreml_float16_all.bin in Resources */,
682-
83BB78C02C66AAAE00274ED7 /* add_mul_coreml_float16_all.pte in Resources */,
683-
C985519E2AD2542D009143F9 /* mv3_coreml_float16_all.pte in Resources */,
684-
C98551A02AD2542D009143F9 /* add_coreml_float16_all.bin in Resources */,
685-
C98551A22AD2542D009143F9 /* mul_coreml_float16_all.pte in Resources */,
686-
838CA6872CD1965700462190 /* add_mul_coreml_float16_all_compiled.pte in Resources */,
679+
C98551A12AD2542D009143F9 /* mv3_coreml_all.bin in Resources */,
680+
C985519F2AD2542D009143F9 /* mul_coreml_all.bin in Resources */,
681+
83BB78BF2C66AAAE00274ED7 /* add_mul_coreml_all.bin in Resources */,
682+
83BB78C02C66AAAE00274ED7 /* add_mul_coreml_all.pte in Resources */,
683+
C985519E2AD2542D009143F9 /* mv3_coreml_all.pte in Resources */,
684+
C98551A02AD2542D009143F9 /* add_coreml_all.bin in Resources */,
685+
C98551A22AD2542D009143F9 /* mul_coreml_all.pte in Resources */,
686+
838CA6872CD1965700462190 /* add_mul_compiled_coreml_all.pte in Resources */,
687687
8307EB8A2C9262060011AE6D /* state_coreml_all.pte in Resources */,
688-
C98551A32AD2542D009143F9 /* add_coreml_float16_all.pte in Resources */,
688+
C98551A32AD2542D009143F9 /* add_coreml_all.pte in Resources */,
689689
);
690690
runOnlyForDeploymentPostprocessing = 0;
691691
};
@@ -830,7 +830,7 @@
830830
GCC_OPTIMIZATION_LEVEL = 0;
831831
GCC_PREPROCESSOR_DEFINITIONS = (
832832
"DEBUG=1",
833-
C10_USING_CUSTOM_GENERATED_MACROS,
833+
"C10_USING_CUSTOM_GENERATED_MACROS",
834834
"$(inherited)",
835835
);
836836
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -912,7 +912,7 @@
912912
DEVELOPMENT_TEAM = "";
913913
GCC_PREPROCESSOR_DEFINITIONS = (
914914
"DEBUG=1",
915-
C10_USING_CUSTOM_GENERATED_MACROS,
915+
"C10_USING_CUSTOM_GENERATED_MACROS",
916916
"ET_EVENT_TRACER_ENABLED=1",
917917
"$(inherited)",
918918
);

‎backends/apple/coreml/scripts/build_all.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SCRIPT_DIR_PATH="$(
1515
EXECUTORCH_ROOT_PATH=$(realpath "$SCRIPT_DIR_PATH/../../../../")
1616
COREML_DIR_PATH="$EXECUTORCH_ROOT_PATH/backends/apple/coreml"
1717
COREML_EXAMPLES_DIR_PATH="$EXECUTORCH_ROOT_PATH/examples/apple/coreml"
18-
TEST_MODEL_PATH="$COREML_DIR_PATH/runtime/test/models/mv3_coreml_float16_all.pte"
18+
TEST_MODEL_PATH="$COREML_DIR_PATH/runtime/test/models/mv3_coreml_all.pte"
1919

2020
red=`tput setaf 1`
2121
green=`tput setaf 2`

‎backends/apple/coreml/scripts/generate_test_models.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ do
2525
echo "Executorch: Generating $MODEL model"
2626
# TODO: Don't use the script in examples directory.
2727
python3 -m examples.apple.coreml.scripts.export --model_name "$MODEL" --save_processed_bytes
28-
mv -f "$MODEL""_coreml_float16_all.pte" "$COREML_DIR_PATH/runtime/test/models"
29-
mv -f "$MODEL""_coreml_float16_all.bin" "$COREML_DIR_PATH/runtime/test/models"
28+
mv -f "$MODEL""_coreml_all.pte" "$COREML_DIR_PATH/runtime/test/models"
29+
mv -f "$MODEL""_coreml_all.bin" "$COREML_DIR_PATH/runtime/test/models"
3030
done
3131

3232
echo "Executorch: Generating stateful model"
@@ -38,5 +38,5 @@ for MODEL in "${COMPILE_MODELS[@]}"
3838
do
3939
echo "Executorch: Generating compiled $MODEL model"
4040
python3 -m examples.apple.coreml.scripts.export --model_name "$MODEL" --compile
41-
mv -f "$MODEL""_coreml_float16_all_compiled.pte" "$COREML_DIR_PATH/runtime/test/models"
41+
mv -f "$MODEL""_compiled_coreml_all.pte" "$COREML_DIR_PATH/runtime/test/models"
4242
done

‎examples/apple/coreml/scripts/export.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,10 @@ def export_lowered_module_to_executorch_program(lowered_module, example_inputs):
136136

137137

138138
def get_pte_base_name(args: argparse.Namespace) -> str:
139-
pte_name = f"{args.model_name}_coreml_{args.compute_precision}_{args.compute_unit}"
139+
pte_name = args.model_name
140140
if args.compile:
141141
pte_name += "_compiled"
142+
pte_name = f"{pte_name}_{args.compute_unit}"
142143
return pte_name
143144

144145

@@ -254,7 +255,9 @@ def main():
254255
)
255256
save_pte_program(exec_program, pte_base_name)
256257
if args.generate_etrecord:
257-
generate_etrecord(f"{pte_base_name}_etrecord.bin", edge_copy, exec_program)
258+
generate_etrecord(
259+
f"{args.model_name}_coreml_etrecord.bin", edge_copy, exec_program
260+
)
258261

259262
if args.save_processed_bytes:
260263
save_processed_bytes(

0 commit comments

Comments
 (0)