From 9b38590c281d2bd5a5dfb431ce836ee46a075b1f Mon Sep 17 00:00:00 2001
From: neuropilot-captain <neuropilot@mediatek.com>
Date: Wed, 21 Aug 2024 10:47:42 +0800
Subject: [PATCH 1/2] Fix llama runner build

---
 examples/mediatek/CMakeLists.txt                       | 10 +++++-----
 .../executor_runner/mtk_llama_executor_runner.cpp      |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/examples/mediatek/CMakeLists.txt b/examples/mediatek/CMakeLists.txt
index 1018477ec85..966fecb0664 100644
--- a/examples/mediatek/CMakeLists.txt
+++ b/examples/mediatek/CMakeLists.txt
@@ -105,11 +105,10 @@ if(${ANDROID})
         _mtk_llama_executor_runner__srcs
         ${CMAKE_CURRENT_LIST_DIR}/executor_runner/mtk_llama_executor_runner.cpp
     )
-
     # Build ABSL and RE2
-    set(LLAMA2_EXAMPLE_MODEL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../examples/models/llama2)
-    set(THIRD_PARTY_ABSL_DIR ${LLAMA2_EXAMPLE_MODEL_DIR}/third-party/abseil-cpp)
-    set(THIRD_PARTY_RE2_DIR ${LLAMA2_EXAMPLE_MODEL_DIR}/third-party/re2)
+    set(EXTENSIONS_LLM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../extension/llm)
+    set(THIRD_PARTY_ABSL_DIR ${EXTENSIONS_LLM_DIR}/third-party/abseil-cpp)
+    set(THIRD_PARTY_RE2_DIR ${EXTENSIONS_LLM_DIR}/third-party/re2)
     set(ABSL_ENABLE_INSTALL ON)
     set(ABSL_PROPAGATE_CXX_STD ON)
     set(_pic_flag ${CMAKE_POSITION_INDEPENDENT_CODE})
@@ -119,7 +118,7 @@ if(${ANDROID})
     set(CMAKE_POSITION_INDEPENDENT_CODE ${_pic_flag})
 
     # Build tokenizers
-    set(LLAMA2_TOKENIZER_DIR ${LLAMA2_EXAMPLE_MODEL_DIR}/tokenizer)
+    set(LLAMA2_TOKENIZER_DIR ${EXTENSIONS_LLM_DIR}/tokenizer)
     add_library(tokenizer STATIC)
     target_include_directories(tokenizer
         PUBLIC
@@ -135,6 +134,7 @@ if(${ANDROID})
         PRIVATE
         ${LLAMA2_TOKENIZER_DIR}/tiktoken.cpp
         ${LLAMA2_TOKENIZER_DIR}/bpe_tokenizer.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../models/llama2/tokenizer/llama_tiktoken.cpp
     )
 
     # Include directory for neuron headers
diff --git a/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp b/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp
index 59b7a39e1cc..3e43b6b1072 100644
--- a/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp
+++ b/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp
@@ -68,8 +68,9 @@
 #include "llama_runner/Utils.h"
 #include "llama_runner/llm_helper/include/llm_types.h"
 
-#include <executorch/examples/models/llama2/tokenizer/bpe_tokenizer.h>
-#include <executorch/examples/models/llama2/tokenizer/tiktoken.h>
+#include <executorch/extension/llm/tokenizer/bpe_tokenizer.h>
+#include <executorch/extension/llm/tokenizer/tiktoken.h>
+#include <executorch/examples/models/llama2/tokenizer/llama_tiktoken.h>
 
 // Llama model options
 DEFINE_uint64(
@@ -316,7 +317,7 @@ std::unique_ptr<Tokenizer> load_tokenizer() {
   if (FLAGS_tokenizer_type == "bpe") {
     tokenizer = std::make_unique<torch::executor::BPETokenizer>();
   } else if (FLAGS_tokenizer_type == "tiktoken") {
-    tokenizer = std::make_unique<torch::executor::Tiktoken>();
+    tokenizer = torch::executor::get_tiktoken_for_llama();
   }
   ET_CHECK_MSG(
       tokenizer, "Invalid tokenizer type: %s", FLAGS_tokenizer_type.c_str());

From 629d099fa95cf94d1735f47d5efbd17ba8254627 Mon Sep 17 00:00:00 2001
From: neuropilot-captain
 <76544501+neuropilot-captain@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:28:39 +0800
Subject: [PATCH 2/2] Fix linter error

---
 examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp b/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp
index 3e43b6b1072..b605dd13bec 100644
--- a/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp
+++ b/examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp
@@ -68,9 +68,9 @@
 #include "llama_runner/Utils.h"
 #include "llama_runner/llm_helper/include/llm_types.h"
 
+#include <executorch/examples/models/llama2/tokenizer/llama_tiktoken.h>
 #include <executorch/extension/llm/tokenizer/bpe_tokenizer.h>
 #include <executorch/extension/llm/tokenizer/tiktoken.h>
-#include <executorch/examples/models/llama2/tokenizer/llama_tiktoken.h>
 
 // Llama model options
 DEFINE_uint64(