Skip to content

Commit 361b295

Browse files
[ExecuTorch] Separate extension.Module Namespaces from Aten and non-Aten
Separate `extension.Module` Namespaces to be `executorch::extension::module` and `executorch::extension::module_aten`, otherwise in the future there will be issues like P1799454769. It's similar to what we already did for bundled_program in #10307 Differential Revision: [D73903870](https://our.internmc.facebook.com/intern/diff/D73903870/) [ghstack-poisoned]
1 parent c5dd476 commit 361b295

File tree

32 files changed

+89
-36
lines changed

32 files changed

+89
-36
lines changed

docs/source/extension-module.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Let's see how we can run the `SimpleConv` model generated from the [Exporting to
1313
#include <executorch/extension/tensor/tensor.h>
1414

1515
using namespace ::executorch::extension;
16+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
1617

1718
// Create a Module.
1819
Module module("/path/to/model.pte");
@@ -221,6 +222,7 @@ Use [ExecuTorch Dump](etdump.md) to trace model execution. Create an `ETDumpGen`
221222
#include <executorch/devtools/etdump/etdump_flatcc.h>
222223

223224
using namespace ::executorch::extension;
225+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
224226

225227
Module module("/path/to/model.pte", Module::LoadMode::MmapUseMlock, std::make_unique<ETDumpGen>());
226228

docs/source/extension-tensor.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Imagine you’re working with a [`Module`](extension-module.md) interface, and y
1111

1212
using namespace executorch::aten;
1313
using namespace executorch::extension;
14+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
1415

1516
SizesType sizes[] = {2, 3};
1617
DimOrderType dim_order[] = {0, 1};
@@ -42,6 +43,7 @@ Here’s how you can use it:
4243
#include <executorch/extension/tensor/tensor.h>
4344
4445
using namespace executorch::extension;
46+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
4547
4648
auto tensor = make_tensor_ptr(
4749
{2, 3}, // sizes

docs/source/getting-started.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ Loading and running a model using the high-level API can be done as follows:
194194
#include <executorch/extension/tensor/tensor.h>
195195

196196
using namespace ::executorch::extension;
197+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
197198

198199
// Load the model.
199200
Module module("/path/to/model.pte");

docs/source/llm/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Create a file called main.cpp with the following contents:
209209
using executorch::aten::ScalarType;
210210
using executorch::aten::Tensor;
211211
using executorch::extension::from_blob;
212-
using executorch::extension::Module;
212+
using executorch::extension::ET_MODULE_NAMESPACE::Module;
213213
using executorch::runtime::EValue;
214214
using executorch::runtime::Result;
215215
```

docs/source/using-executorch-cpp.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ In addition the Module class, the tensor extension provides an encapsulated inte
1313
#include <executorch/extension/tensor/tensor.h>
1414

1515
using namespace ::executorch::extension;
16+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
1617

1718
// Load the model.
1819
Module module("/path/to/model.pte");

examples/llm_manual/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using executorch::aten::ScalarType;
2121
using executorch::aten::Tensor;
2222
using executorch::extension::from_blob;
23-
using executorch::extension::Module;
23+
using executorch::extension::ET_MODULE_NAMESPACE::Module;
2424
using executorch::runtime::EValue;
2525
using executorch::runtime::Result;
2626

examples/models/llama/runner/runner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace example {
2323

24-
using ::executorch::extension::Module;
24+
using ::executorch::extension::ET_MODULE_NAMESPACE::Module;
2525
using ::executorch::runtime::Error;
2626
using ::executorch::runtime::Result;
2727

examples/models/llama/runner/runner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ET_EXPERIMENTAL Runner : public executorch::extension::llm::IRunner {
6060
bool shouldStop_{false};
6161

6262
// model
63-
std::unique_ptr<::executorch::extension::Module> module_;
63+
std::unique_ptr<::executorch::extension::ET_MODULE_NAMESPACE::Module> module_;
6464
std::string tokenizer_path_;
6565
std::unique_ptr<::tokenizers::Tokenizer> tokenizer_;
6666
std::unordered_map<std::string, int64_t> metadata_;

examples/models/llava/runner/llava_image_prefiller.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ namespace example {
1818
class ET_EXPERIMENTAL LlavaImagePrefiller
1919
: public ::executorch::extension::llm::ImagePrefiller {
2020
public:
21-
explicit LlavaImagePrefiller(::executorch::extension::Module* module)
21+
explicit LlavaImagePrefiller(
22+
::executorch::extension::ET_MODULE_NAMESPACE::Module* module)
2223
: ImagePrefiller(module){};
2324
/**
2425
* Prefill an LLM Module with the given image input.

examples/models/llava/runner/llava_text_decoder_runner.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ namespace example {
1717
class ET_EXPERIMENTAL LlavaTextDecoderRunner
1818
: public executorch::extension::llm::TextDecoderRunner {
1919
public:
20-
explicit LlavaTextDecoderRunner(executorch::extension::Module* module)
20+
explicit LlavaTextDecoderRunner(
21+
executorch::extension::ET_MODULE_NAMESPACE::Module* module)
2122
: TextDecoderRunner(module, true) {}
2223

2324
inline executorch::runtime::Result<executorch::aten::Tensor> step(

0 commit comments

Comments
 (0)