executorch
executorch copied to clipboard
Published
20 hours ago •
pytorch
pytorch
Move Cadence primary code to backends folder
Previous folder structure:
executorch
└── examples
├── aot
├── kernels
├── ops
├── tests
├── third-party/hifi4-nnlib
└── utils
New folder structure:
executorch
├── backends
│ └── cadence
│ ├── aot
│ ├── ops_registration
│ ├── tests
│ ├── utils
│ ├── hifi
│ │ ├── kernels
│ │ ├── operators
│ │ └── third-party
│ │ └── nnlib
│ └── [other cadence DSP families]
│ ├── kernels
│ ├── operators
│ └── third-party
│ └── [any required lib]
└── examples
└── cadence
├── models
└── operators
Differential Revision: D56577399
:link: Helpful Links
:test_tube: See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/3353
- :page_facing_up: Preview Python docs built from this PR
Note: Links to docs will display an error until the docs builds have been completed.
:x: 1 New Failure, 1 Unrelated Failure
As of commit eb3bc48c10b23ee12c6fcd6141b674aaa65b2fe3 with merge base f227fc3dab30ed1d2de10452bce7219c9ad47955 (
NEW FAILURE - The following job has failed:
-
pull / unittest / linux (buck2) / linux-job (gh)
backends/arm/test/ops/test_add.py::TestSimpleAdd::test_add_tosa_MI_0
BROKEN TRUNK - The following job failed but were present on the merge base:
👉 Rebase onto the `viable/strict` branch to avoid these failures
-
pull / unittest / macos (buck2) / macos-job (gh) (trunk failure)
backends/arm/test/ops/test_add.py::TestSimpleAdd::test_add_tosa_MI_0
This comment was automatically generated by Dr. CI and updates every 15 minutes.
![pytorch-bot[bot] avatar](https://avatars.githubusercontent.com/in/40112?v=4 "Published by a pub.dev verified publisher"){kind=small}
This pull request has been merged in pytorch/executorch@c001f597f571dcbc06273367c683b716203f10c3.
Cherry picking #3353
Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs c001f597f571dcbc06273367c683b716203f10c3 returned non-zero exit code 1
CONFLICT (rename/delete): examples/cadence/aot/compiler.py renamed to backends/cadence/aot/compiler.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/aot/export_example.py renamed to backends/cadence/aot/export_example.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (modify/delete): backends/cadence/aot/export_example.py deleted in HEAD and modified in c001f597f (Cadence - Move primary code to backends folder (#3353)). Version c001f597f (Cadence - Move primary code to backends folder (#3353)) of backends/cadence/aot/export_example.py left in tree.
CONFLICT (rename/delete): examples/cadence/ops/functions.yaml renamed to backends/cadence/aot/functions.yaml in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/aot/meta_registrations.py renamed to backends/cadence/aot/ops_registrations.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/aot/quantizer.py renamed to backends/cadence/aot/quantizer.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/aot/utils.py renamed to backends/cadence/aot/utils.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/ops/op_embedding.cpp renamed to backends/cadence/hifi/operators/op_embedding.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/ops/op_view_copy.cpp renamed to backends/cadence/hifi/operators/op_view_copy.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/ops/quantized_conv_out.cpp renamed to backends/cadence/hifi/operators/quantized_conv_out.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/ops/quantized_layer_norm.cpp renamed to backends/cadence/hifi/operators/quantized_layer_norm.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (rename/delete): examples/cadence/ops/quantized_relu_out.cpp renamed to backends/cadence/hifi/operators/quantized_relu_out.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
Auto-merging docs/source/build-run-xtensa.md
Auto-merging examples/cadence/CMakeLists.txt
CONFLICT (rename/rename): examples/cadence/CMakeLists.txt renamed to examples/xtensa/CMakeLists.txt in HEAD and to backends/cadence/CMakeLists.txt in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/cadence.cmake renamed to examples/xtensa/xtensa.cmake in HEAD and to backends/cadence/cadence.cmake in c001f597f (Cadence - Move primary code to backends folder (#3353)).
Auto-merging examples/cadence/executor_runner.cpp
CONFLICT (rename/rename): examples/cadence/executor_runner.cpp renamed to examples/xtensa/executor_runner.cpp in HEAD and to backends/cadence/executor_runner.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
Auto-merging examples/cadence/kernels/CMakeLists.txt
CONFLICT (rename/rename): examples/cadence/kernels/CMakeLists.txt renamed to examples/xtensa/kernels/CMakeLists.txt in HEAD and to backends/cadence/hifi/kernels/CMakeLists.txt in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/kernels/kernels.cpp renamed to examples/xtensa/kernels/kernels.cpp in HEAD and to backends/cadence/hifi/kernels/kernels.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/kernels/kernels.h renamed to examples/xtensa/kernels/kernels.h in HEAD and to backends/cadence/hifi/kernels/kernels.h in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/delete): examples/cadence/tests/rnnt_predictor_quantized_example.py renamed to examples/cadence/models/rnnt_predictor.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (modify/delete): examples/cadence/models/rnnt_predictor.py deleted in HEAD and modified in c001f597f (Cadence - Move primary code to backends folder (#3353)). Version c001f597f (Cadence - Move primary code to backends folder (#3353)) of examples/cadence/models/rnnt_predictor.py left in tree.
CONFLICT (rename/delete): examples/cadence/tests/quantized_conv1d_example.py renamed to examples/cadence/operators/quantized_conv1d_op.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (modify/delete): examples/cadence/operators/quantized_conv1d_op.py deleted in HEAD and modified in c001f597f (Cadence - Move primary code to backends folder (#3353)). Version c001f597f (Cadence - Move primary code to backends folder (#3353)) of examples/cadence/operators/quantized_conv1d_op.py left in tree.
CONFLICT (rename/delete): examples/cadence/tests/quantized_linear_example.py renamed to examples/cadence/operators/quantized_linear_op.py in c001f597f (Cadence - Move primary code to backends folder (#3353)), but deleted in HEAD.
CONFLICT (modify/delete): examples/cadence/operators/quantized_linear_op.py deleted in HEAD and modified in c001f597f (Cadence - Move primary code to backends folder (#3353)). Version c001f597f (Cadence - Move primary code to backends folder (#3353)) of examples/cadence/operators/quantized_linear_op.py left in tree.
Auto-merging examples/cadence/ops/CMakeLists.txt
CONFLICT (rename/rename): examples/cadence/ops/CMakeLists.txt renamed to examples/xtensa/ops/CMakeLists.txt in HEAD and to backends/cadence/hifi/operators/CMakeLists.txt in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/ops/dequantize_per_tensor.cpp renamed to examples/xtensa/ops/dequantize_per_tensor.cpp in HEAD and to backends/cadence/hifi/operators/dequantize_per_tensor.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/ops/op_add.cpp renamed to examples/xtensa/ops/op_add.cpp in HEAD and to backends/cadence/hifi/operators/op_add.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/ops/op_full.cpp renamed to examples/xtensa/ops/op_full.cpp in HEAD and to backends/cadence/hifi/operators/op_full.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/ops/quantize_per_tensor.cpp renamed to examples/xtensa/ops/quantize_per_tensor.cpp in HEAD and to backends/cadence/hifi/operators/quantize_per_tensor.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/ops/quantized_linear_out.cpp renamed to examples/xtensa/ops/quantized_linear_out.cpp in HEAD and to backends/cadence/hifi/operators/quantized_linear_out.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/third-party/nnlib-hifi4/license.txt renamed to examples/xtensa/third-party/nnlib-hifi4/license.txt in HEAD and to backends/cadence/hifi/third-party/nnlib/license.txt in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/third-party/nnlib-hifi4/matmul_asym8uxasym8u_asym8u.cpp renamed to examples/xtensa/third-party/nnlib-hifi4/matmul_asym8uxasym8u_asym8u.cpp in HEAD and to backends/cadence/hifi/third-party/nnlib/matmul_asym8uxasym8u_asym8u.cpp in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/third-party/nnlib-hifi4/matmul_asym8uxasym8u_asym8u_macros.h renamed to examples/xtensa/third-party/nnlib-hifi4/matmul_asym8uxasym8u_asym8u_macros.h in HEAD and to backends/cadence/hifi/third-party/nnlib/matmul_asym8uxasym8u_asym8u_macros.h in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/third-party/nnlib-hifi4/xa_nnlib_matmul_unroll_macros.h renamed to examples/xtensa/third-party/nnlib-hifi4/xa_nnlib_matmul_unroll_macros.h in HEAD and to backends/cadence/hifi/third-party/nnlib/xa_nnlib_matmul_unroll_macros.h in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/utils/gen_header.py renamed to examples/xtensa/utils/gen_header.py in HEAD and to backends/cadence/utils/gen_header.py in c001f597f (Cadence - Move primary code to backends folder (#3353)).
CONFLICT (rename/rename): examples/cadence/utils/post_compilation.py renamed to examples/xtensa/utils/post_compilation.py in HEAD and to backends/cadence/utils/post_compilation.py in c001f597f (Cadence - Move primary code to backends folder (#3353)).
error: could not apply c001f597f... Cadence - Move primary code to backends folder (#3353)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
