|
15 | 15 |
|
16 | 16 | #include <ethosu_driver.h> |
17 | 17 |
|
18 | | -#include "executorch/backends/arm/runtime/VelaBinStream.h" |
19 | | -#include "executorch/runtime/backend/interface.h" |
20 | | -#include "executorch/runtime/core/error.h" |
21 | | -#include "executorch/runtime/core/evalue.h" |
22 | | -#include "executorch/runtime/core/exec_aten/util/dim_order_util.h" |
23 | | -#include "executorch/runtime/core/exec_aten/util/scalar_type_util.h" |
| 18 | +#include <executorch/backends/arm/runtime/VelaBinStream.h> |
| 19 | +#include <executorch/runtime/backend/interface.h> |
| 20 | +#include <executorch/runtime/core/error.h> |
| 21 | +#include <executorch/runtime/core/evalue.h> |
| 22 | +#include <executorch/runtime/core/exec_aten/util/dim_order_util.h> |
| 23 | +#include <executorch/runtime/core/exec_aten/util/scalar_type_util.h> |
24 | 24 |
|
25 | 25 | using namespace std; |
26 | 26 |
|
27 | | -namespace torch { |
28 | | -namespace executor { |
| 27 | +using executorch::aten::ScalarType; |
| 28 | +using executorch::runtime::ArrayRef; |
| 29 | +using executorch::runtime::Backend; |
| 30 | +using executorch::runtime::BackendExecutionContext; |
| 31 | +using executorch::runtime::BackendInitContext; |
| 32 | +using executorch::runtime::CompileSpec; |
| 33 | +using executorch::runtime::DelegateHandle; |
| 34 | +using executorch::runtime::Error; |
| 35 | +using executorch::runtime::EValue; |
| 36 | +using executorch::runtime::FreeableBuffer; |
| 37 | +using executorch::runtime::MemoryAllocator; |
| 38 | +using executorch::runtime::Result; |
| 39 | + |
| 40 | +namespace executorch { |
| 41 | +namespace backends { |
| 42 | +namespace arm { |
29 | 43 |
|
30 | 44 | typedef struct { |
31 | 45 | FreeableBuffer* processed; |
@@ -142,10 +156,10 @@ class ArmBackend final : public ::executorch::runtime::BackendInterface { |
142 | 156 | Error, |
143 | 157 | "Input %d expected Integer (4 byte) or Char (1 byte) integer inputs, got ScalarType id %s", |
144 | 158 | i, |
145 | | - toString(tensor_in.scalar_type())); |
| 159 | + executorch::runtime::toString(tensor_in.scalar_type())); |
146 | 160 | return Error::InvalidProgram; |
147 | 161 | } |
148 | | - supported = is_contiguous_dim_order( |
| 162 | + supported = executorch::runtime::is_contiguous_dim_order( |
149 | 163 | tensor_in.dim_order().data(), tensor_in.dim()); |
150 | 164 | if (!supported) { |
151 | 165 | ET_LOG( |
@@ -268,7 +282,7 @@ class ArmBackend final : public ::executorch::runtime::BackendInterface { |
268 | 282 | private: |
269 | 283 | Error check_requires_permute( |
270 | 284 | int index, |
271 | | - const exec_aten::Tensor tensor, |
| 285 | + const executorch::aten::Tensor tensor, |
272 | 286 | VelaIO* io, |
273 | 287 | bool permuted_io_flag, |
274 | 288 | bool* is_permuted) const { |
@@ -343,5 +357,6 @@ Backend backend_id{"ArmBackend", &backend}; |
343 | 357 | static auto registered = register_backend(backend_id); |
344 | 358 | } // namespace |
345 | 359 |
|
346 | | -} // namespace executor |
347 | | -} // namespace torch |
| 360 | +} // namespace arm |
| 361 | +} // namespace backends |
| 362 | +} // namespace executorch |
0 commit comments