Skip to content

Commit 286527c

Browse files
authored
Pin Bump PT 20241002; Pin Bump ET to one using that PT pin (#1269)
* Pin Bump PT 20241002; Pin Bump ET to one using that PT pin * Bump to less broken ET pin * Update threadpool api * undo * Bump ET pin and add microkernels for XNN * Update xnn export pass path * Update ET pin to pick up green CI * Use temp AO commit to fix deprecation warnings * Add microkernel to CMAKE * Udpate AO pins
1 parent 6a2a2e8 commit 286527c

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_subdirectory(tokenizer)
1414
# include et_run executable
1515
include(runner/et.cmake)
1616
if(TARGET et_run)
17-
target_link_libraries(et_run PUBLIC tokenizer)
17+
target_link_libraries(et_run PUBLIC tokenizer microkernels-prod)
1818
endif()
1919

2020
# include aoti_run executable

install/.pins/et-pin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
286799c9c844ce6427b8eca260f9b2f28be03291
1+
72b3bb3194c611f7c4861e6f3b24af5de868af72

install/.pins/torchao-pin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ae3e7c68eae7085e13241cb3d6b39481868dd162
1+
49b1fb61c8b8eceda755579a2fd92c756d822de2

install/install_requirements.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ fi
4747
# NOTE: If a newly-fetched version of the executorch repo changes the value of
4848
# PYTORCH_NIGHTLY_VERSION, you should re-run this script to install the necessary
4949
# package versions.
50-
PYTORCH_NIGHTLY_VERSION=dev20240901
50+
PYTORCH_NIGHTLY_VERSION=dev20241002
5151

5252
# Nightly version for torchvision
53-
VISION_NIGHTLY_VERSION=dev20240901
53+
VISION_NIGHTLY_VERSION=dev20241002
5454

5555
# Nightly version for torchtune
5656
TUNE_NIGHTLY_VERSION=dev20240928
@@ -76,7 +76,7 @@ fi
7676

7777
# pip packages needed by exir.
7878
REQUIREMENTS_TO_INSTALL=(
79-
torch=="2.5.0.${PYTORCH_NIGHTLY_VERSION}"
79+
torch=="2.6.0.${PYTORCH_NIGHTLY_VERSION}"
8080
torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}"
8181
torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}"
8282
)

runner/et.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ if(executorch_FOUND)
9494
optimized_native_cpu_ops_lib
9595
quantized_ops_lib
9696
xnnpack_backend
97+
microkernels-prod
9798
XNNPACK
9899
pthreadpool
99100
cpuinfo

torchchat/export.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def export_for_server(
9494
from executorch.backends.xnnpack.partition.xnnpack_partitioner import (
9595
XnnpackDynamicallyQuantizedPartitioner,
9696
)
97-
from executorch.backends.xnnpack.passes.convert_to_linear import (
97+
from executorch.backends.xnnpack._passes.convert_to_linear import (
9898
ConvertToLinearPass,
9999
)
100100
from executorch.exir import EdgeProgramManager, to_edge

0 commit comments

Comments
 (0)