diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cc2d3347..61fd4d5a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory(tokenizer) # include et_run executable include(runner/et.cmake) if(TARGET et_run) - target_link_libraries(et_run PUBLIC tokenizer) + target_link_libraries(et_run PUBLIC tokenizer microkernels-prod) endif() # include aoti_run executable diff --git a/install/.pins/et-pin.txt b/install/.pins/et-pin.txt index ceb4852bf..e61fae3a5 100644 --- a/install/.pins/et-pin.txt +++ b/install/.pins/et-pin.txt @@ -1 +1 @@ -286799c9c844ce6427b8eca260f9b2f28be03291 +72b3bb3194c611f7c4861e6f3b24af5de868af72 diff --git a/install/.pins/torchao-pin.txt b/install/.pins/torchao-pin.txt index a6a965960..a7422ea2e 100644 --- a/install/.pins/torchao-pin.txt +++ b/install/.pins/torchao-pin.txt @@ -1 +1 @@ -ae3e7c68eae7085e13241cb3d6b39481868dd162 +49b1fb61c8b8eceda755579a2fd92c756d822de2 diff --git a/install/install_requirements.sh b/install/install_requirements.sh index e525434a3..a05e255db 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -47,10 +47,10 @@ fi # NOTE: If a newly-fetched version of the executorch repo changes the value of # PYTORCH_NIGHTLY_VERSION, you should re-run this script to install the necessary # package versions. -PYTORCH_NIGHTLY_VERSION=dev20240901 +PYTORCH_NIGHTLY_VERSION=dev20241002 # Nightly version for torchvision -VISION_NIGHTLY_VERSION=dev20240901 +VISION_NIGHTLY_VERSION=dev20241002 # Nightly version for torchtune TUNE_NIGHTLY_VERSION=dev20240928 @@ -76,7 +76,7 @@ fi # pip packages needed by exir. REQUIREMENTS_TO_INSTALL=( - torch=="2.5.0.${PYTORCH_NIGHTLY_VERSION}" + torch=="2.6.0.${PYTORCH_NIGHTLY_VERSION}" torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}" torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}" ) diff --git a/runner/et.cmake b/runner/et.cmake index 916ce9ea8..df0aa70df 100644 --- a/runner/et.cmake +++ b/runner/et.cmake @@ -94,6 +94,7 @@ if(executorch_FOUND) optimized_native_cpu_ops_lib quantized_ops_lib xnnpack_backend + microkernels-prod XNNPACK pthreadpool cpuinfo diff --git a/torchchat/export.py b/torchchat/export.py index c024e9deb..626d4fae3 100644 --- a/torchchat/export.py +++ b/torchchat/export.py @@ -94,7 +94,7 @@ def export_for_server( from executorch.backends.xnnpack.partition.xnnpack_partitioner import ( XnnpackDynamicallyQuantizedPartitioner, ) - from executorch.backends.xnnpack.passes.convert_to_linear import ( + from executorch.backends.xnnpack._passes.convert_to_linear import ( ConvertToLinearPass, ) from executorch.exir import EdgeProgramManager, to_edge