Pin to release/1.0 (#98)

mergennachin · web-flow · commit e7c9c8433e02 · 2025-10-19T21:27:32.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,21 +1,9 @@
-[submodule "efficient_sam/wasm/executorch"]
-	path = efficient_sam/wasm/executorch
-	url = https://github.com/pytorch/executorch.git
-
-[submodule "mv2/cpp/executorch"]
-	path = mv2/cpp/executorch
-	url = https://github.com/pytorch/executorch.git
-	branch = release/0.6
-
-[submodule "mv2/wasm/executorch"]
-	path = mv2/wasm/executorch
+[submodule "third-party/executorch"]
+	path = third-party/executorch
 	url = https://github.com/pytorch/executorch.git
+	branch = release/1.0
 
 [submodule "program-data-separation/cpp/executorch"]
 	path = program-data-separation/cpp/executorch
 	url = https://github.com/pytorch/executorch.git
 	branch = release/0.7
-
-[submodule "stories110M/wasm/executorch"]
-	path = stories110M/wasm/executorch
-	url = https://github.com/pytorch/executorch.git
diff --git a/efficient_sam/wasm/CMakeLists.txt b/efficient_sam/wasm/CMakeLists.txt
@@ -8,6 +8,9 @@
 # cmake-format -i CMakeLists.txt
 # ~~~
 
+cmake_minimum_required(VERSION 3.19)
+project(efficient_sam_wasm_demo)
+
 add_subdirectory("executorch")
 
 add_executable(executorch_wasm_demo_lib)
diff --git a/efficient_sam/wasm/build.sh b/efficient_sam/wasm/build.sh
@@ -11,6 +11,7 @@ emcmake cmake . -DEXECUTORCH_BUILD_WASM=ON \
     -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
     -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
     -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
+    -DEXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP=ON \
     -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
     -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \
     -DEXECUTORCH_BUILD_XNNPACK=ON \
diff --git a/efficient_sam/wasm/executorch b/efficient_sam/wasm/executorch
diff --git a/efficient_sam/wasm/executorch b/efficient_sam/wasm/executorch
@@ -0,0 +1 @@
+../../third-party/executorch
diff --git a/efficient_sam/wasm/export.sh b/efficient_sam/wasm/export.sh
@@ -7,7 +7,7 @@
 
 cd executorch
 
-python3 -c "
+python -c "
 from examples.models.model_factory import EagerModelFactory
 from executorch.backends.xnnpack.partition.xnnpack_partitioner import XnnpackPartitioner
 from executorch.exir import to_edge_transform_and_lower
diff --git a/mv2/cpp/CMakeLists.txt b/mv2/cpp/CMakeLists.txt
@@ -4,13 +4,15 @@ project(executorch_mv2_demo CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Set options for executorch build.
-option(EXECUTORCH_ENABLE_LOGGING "" ON)
+# Set options for executorch build (based on linux/llm preset)
 option(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER "" ON)
+option(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR "" ON)
 option(EXECUTORCH_BUILD_EXTENSION_MODULE "" ON)
+option(EXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP "" ON)
 option(EXECUTORCH_BUILD_EXTENSION_TENSOR "" ON)
 option(EXECUTORCH_BUILD_KERNELS_OPTIMIZED "" ON)
 option(EXECUTORCH_BUILD_XNNPACK "" ON)
+option(EXECUTORCH_XNNPACK_ENABLE_KLEIDI "" OFF)
 
 # Add ExecuTorch subdirectory
 add_subdirectory("executorch")
diff --git a/mv2/cpp/README.md b/mv2/cpp/README.md
@@ -6,7 +6,7 @@ This is a simple C++ demo application that uses the ExecuTorch library for Mobil
 
 0. Export the model. See [mv2/python/README.md](../python/README.md)
 
-1. The ExecuTorch repository is already configured as a git submodule at `~/executorch-examples/mv2/cpp/executorch/`. To initialize it:
+1. The ExecuTorch repository is configured as a git submodule at `~/executorch-examples/third-party/executorch/`, with `mv2/cpp/executorch` being a symlink to it. To initialize:
    ```bash
     cd ~/executorch-examples/
     git submodule sync
@@ -36,7 +36,7 @@ This is a simple C++ demo application that uses the ExecuTorch library for Mobil
 
 - CMake 3.18 or higher
 - C++17 compatible compiler
-- ExecuTorch library (release/0.6)
+- ExecuTorch library (release/1.0)
 
 ## Notes
 
diff --git a/mv2/cpp/executorch b/mv2/cpp/executorch
diff --git a/mv2/cpp/executorch b/mv2/cpp/executorch
@@ -0,0 +1 @@
+../../third-party/executorch
diff --git a/mv2/python/requirements.txt b/mv2/python/requirements.txt
@@ -1 +1,2 @@
-executorch==0.6.0
+executorch==1.0.0
+torchvision==0.24.0
diff --git a/mv2/wasm/CMakeLists.txt b/mv2/wasm/CMakeLists.txt
@@ -9,6 +9,9 @@
 # cmake-format -i CMakeLists.txt
 # ~~~
 
+cmake_minimum_required(VERSION 3.19)
+project(executorch_wasm_demo)
+
 add_subdirectory("executorch")
 
 add_executable(executorch_wasm_demo_lib)
diff --git a/mv2/wasm/build.sh b/mv2/wasm/build.sh
@@ -11,6 +11,7 @@ emcmake cmake . -DEXECUTORCH_BUILD_WASM=ON \
     -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
     -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
     -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
+    -DEXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP=ON \
     -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
     -DCMAKE_BUILD_TYPE=Release \
     -B"${CMAKE_OUT}"
diff --git a/mv2/wasm/executorch b/mv2/wasm/executorch
diff --git a/mv2/wasm/executorch b/mv2/wasm/executorch
@@ -0,0 +1 @@
+../../third-party/executorch
diff --git a/stories110M/wasm/CMakeLists.txt b/stories110M/wasm/CMakeLists.txt
@@ -8,6 +8,9 @@
 # cmake-format -i CMakeLists.txt
 # ~~~
 
+cmake_minimum_required(VERSION 3.19)
+project(stories110M_wasm_demo)
+
 add_subdirectory("executorch")
 
 # Tokenizer
diff --git a/stories110M/wasm/build.sh b/stories110M/wasm/build.sh
@@ -12,6 +12,7 @@ if [ ! -f "$CMAKE_OUT/CMakeCache.txt" ]; then
         -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
         -DEXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR=ON \
         -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
+        -DEXECUTORCH_BUILD_EXTENSION_NAMED_DATA_MAP=ON \
         -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
         -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \
         -DEXECUTORCH_BUILD_XNNPACK=ON \
diff --git a/stories110M/wasm/executorch b/stories110M/wasm/executorch
diff --git a/stories110M/wasm/executorch b/stories110M/wasm/executorch
@@ -0,0 +1 @@
+../../third-party/executorch
diff --git a/stories110M/wasm/export.sh b/stories110M/wasm/export.sh
@@ -14,6 +14,6 @@ echo '{"dim": 768, "multiple_of": 32, "n_heads": 12, "n_layers": 12, "norm_eps":
 
 cd executorch
 
-python3 -m extension.llm.export.export_llm base.checkpoint="$temp_pt" base.params="$temp_params" backend.xnnpack.enabled=True model.use_kv_cache=True export.output_name=../stories110M.pte
+python -m extension.llm.export.export_llm base.checkpoint="$temp_pt" base.params="$temp_params" backend.xnnpack.enabled=True model.use_kv_cache=True export.output_name=../stories110M.pte
 
 rm "$temp_pt" "$temp_params"
diff --git a/third-party/executorch b/third-party/executorch
@@ -0,0 +1 @@
+Subproject commit 8c84780911e7f4e9eb19395181b04761392a4b56
