[llava][11/N] Migrate sampler to extension/llm

Summary: Move sampler code to extension/llm so that it can be reused by llava runner. Test Plan: Reviewers: Subscribers: Tasks: Tags: [ghstack-poisoned]
pytorch · Jul 30, 2024 · 7b2ba62 · 7b2ba62
1 parent 1e14333
commit 7b2ba62
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 3 deletions.
diff --git a/examples/models/llama2/runner/runner.h b/examples/models/llama2/runner/runner.h
@@ -17,7 +17,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <executorch/examples/models/llama2/sampler/sampler.h>
+#include <executorch/extension/llm/sampler/sampler.h>
 #include <executorch/extension/llm/tokenizer/tokenizer.h>
 #include <executorch/extension/module/module.h>
 #include <executorch/extension/runner_util/managed_tensor.h>

diff --git a/examples/models/llama2/runner/targets.bzl b/examples/models/llama2/runner/targets.bzl
@@ -33,7 +33,7 @@ def define_common_targets():
             ],
             exported_deps = [
                 "//executorch/backends/xnnpack:xnnpack_backend",
-                "//executorch/examples/models/llama2/sampler:sampler" + aten_suffix,
+                "//executorch/extension/llm/sampler:sampler" + aten_suffix,
                 "//executorch/extension/evalue_util:print_evalue" + aten_suffix,
                 "//executorch/extension/runner_util:managed_tensor" + aten_suffix,
                 "//executorch/extension/module:module" + aten_suffix,

diff --git a/examples/models/llama2/sampler/TARGETS → extension/llm/sampler/TARGETS b/examples/models/llama2/sampler/TARGETS → extension/llm/sampler/TARGETS
diff --git a/examples/models/llama2/sampler/sampler.cpp → extension/llm/sampler/sampler.cpp b/examples/models/llama2/sampler/sampler.cpp → extension/llm/sampler/sampler.cpp
@@ -32,7 +32,7 @@
  * SOFTWARE.
  */
 
-#include <executorch/examples/models/llama2/sampler/sampler.h>
+#include <executorch/extension/llm/sampler/sampler.h>
 
 namespace torch {
 namespace executor {

diff --git a/examples/models/llama2/sampler/sampler.h → extension/llm/sampler/sampler.h b/examples/models/llama2/sampler/sampler.h → extension/llm/sampler/sampler.h
diff --git a/examples/models/llama2/sampler/targets.bzl → extension/llm/sampler/targets.bzl b/examples/models/llama2/sampler/targets.bzl → extension/llm/sampler/targets.bzl
diff --git a/examples/models/llama2/sampler/test/TARGETS → extension/llm/sampler/test/TARGETS b/examples/models/llama2/sampler/test/TARGETS → extension/llm/sampler/test/TARGETS
diff --git a/...es/models/llama2/sampler/test/targets.bzl → extension/llm/sampler/test/targets.bzl b/...es/models/llama2/sampler/test/targets.bzl → extension/llm/sampler/test/targets.bzl
diff --git a/...dels/llama2/sampler/test/test_sampler.cpp → extension/llm/sampler/test/test_sampler.cpp b/...dels/llama2/sampler/test/test_sampler.cpp → extension/llm/sampler/test/test_sampler.cpp