Skip to content

Move Cadence primary code to backends folder#3353

Closed
mcremon-meta wants to merge 1 commit intomainfrom
export-D56577399
Closed

Move Cadence primary code to backends folder#3353
mcremon-meta wants to merge 1 commit intomainfrom
export-D56577399

Conversation

@mcremon-meta
Copy link
Copy Markdown
Contributor

@mcremon-meta mcremon-meta commented Apr 25, 2024 •
edited
Loading

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

@pytorch-bot
Copy link
Copy Markdown

pytorch-bot bot commented Apr 25, 2024 •
edited
Loading

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/3353

Note: Links to docs will display an error until the docs builds have been completed.

❌ 1 New Failure, 1 Unrelated Failure

As of commit eb3bc48 with merge base f227fc3 (image):

NEW FAILURE - The following job has failed:

BROKEN TRUNK - The following job failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 25, 2024
@mcremon-meta mcremon-meta marked this pull request as draft April 25, 2024 16:01
@mcremon-meta mcremon-meta force-pushed the export-D56577399 branch 7 times, most recently from 02e10e6 to 5ecc748 Compare April 30, 2024 16:30
@mcremon-meta mcremon-meta marked this pull request as ready for review April 30, 2024 16:59
@huydhn huydhn mentioned this pull request May 1, 2024
Merged
huydhn added a commit to pytorch/test-infra that referenced this pull request May 2, 2024
@huydhn
[Reland] Use head sha timestamp as end date for similar failure search (
45e6a91 
#5160)

The context is in #5151. This
reland PR adds 2 more fixes:

* Do a left join from `workflow_job` to `push`, so that Dr.CI can always
find all the jobs from the PR even when the commit SHA is not found on
`push` in the case of forked PRs. The `head_sha_timestamp` field will be
empty then.
* When the `head_sha_timestamp` is empty, call `fetchCommitTimestamp` to
get the timestamp directly from GitHub. This is done once per commit.

Note that if the GitHub query fails and `head_sha_timestamp` is still
empty. Dr.CI won't apply similar flaky search to avoid FP, the search
query would expand to the current date otherwise.

### Testing

```
curl --request POST \
--url "http://localhost:3000/api/drci/drci?prNumber=PR_NUMBER" \
--header "Authorization: TOKEN" \
--data 'repo=pytorch'
```

1. pytorch/pytorch#125271, new forked PR, no
ciflow. `head_sha_timestamp` from Rockset is empty and
`fetchCommitTimestamp` is invoked. Dr.CI continues to work.

<details open><summary><b>NEW FAILURES</b> - The following jobs have
failed:</summary><p>

* [Lint / lintrunner-clang /
linux-job](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449212917)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585059/job/24449212917))
    `>>> Lint for torch/csrc/utils/tensor_memoryformats.cpp:`
* [pull / linux-focal-cuda12.1-py3.10-gcc9 / test (default, 2, 5,
linux.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449643728)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449643728))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-cuda12.1-py3.10-gcc9-sm86 / test (default, 2, 5,
linux.g5.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24450124622)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24450124622))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.11-clang10 / test (crossref, 2, 2,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449335282)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449335282))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.11-clang10 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449334520)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449334520))

`test_tensor_creation_ops.py::TestTensorCreationCPU::test_constructor_dtypes_cpu`
* [pull / linux-focal-py3.11-clang10 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449334757)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449334757))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.11-clang10 / test (dynamo, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449335837)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449335837))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.12-clang10 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449281229)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449281229))

`test_tensor_creation_ops.py::TestTensorCreationCPU::test_constructor_dtypes_cpu`
* [pull / linux-focal-py3.12-clang10 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449281368)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449281368))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.12-clang10 / test (dynamo, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449282003)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449282003))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.8-clang10 / test (crossref, 2, 2,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449309061)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449309061))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.8-clang10 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449308208)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449308208))

`test_tensor_creation_ops.py::TestTensorCreationCPU::test_constructor_dtypes_cpu`
* [pull / linux-focal-py3.8-clang10 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449308391)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449308391))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-focal-py3.8-clang10 / test (dynamo, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449309632)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449309632))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-jammy-py3.10-clang15-asan / test (default, 2, 6,
linux.4xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449403443)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449403443))
    `test_autograd.py::TestAutograd::test_type_conversions`
* [pull / linux-jammy-py3.8-gcc11 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449357342)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449357342))

`test_tensor_creation_ops.py::TestTensorCreationCPU::test_constructor_dtypes_cpu`
* [pull / linux-jammy-py3.8-gcc11 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125271#24449357569)
([gh](https://github.com/pytorch/pytorch/actions/runs/8902585046/job/24449357569))
    `test_autograd.py::TestAutograd::test_type_conversions`
</p></details>

2. pytorch/pytorch#125225. Another forked PR
with `ciflow/trunk`. `head_sha_timestamp` is now available from Rockset
and `fetchCommitTimestamp` is not needed

<details open><summary><b>NEW FAILURES</b> - The following jobs have
failed:</summary><p>

* [pull / linux-focal-cuda12.1-py3.10-gcc9 / test (default, 1, 5,
linux.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445851668)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445851668))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-cuda12.1-py3.10-gcc9 / test (default, 2, 5,
linux.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445852045)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445852045))

`test_transformers.py::TestTransformersCUDA::test_script_encoder_subclass_cuda`
* [pull / linux-focal-cuda12.1-py3.10-gcc9 / test (default, 3, 5,
linux.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445852311)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445852311))

`dynamo/test_autograd_function.py::AutogradFunctionTests::test_amp_custom_fwd_bwd`
* [pull / linux-focal-cuda12.1-py3.10-gcc9 / test (default, 4, 5,
linux.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445852638)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445852638))
`test_jit.py::TestScript::test_torchscript_multi_head_attn_fast_path`
* [pull / linux-focal-cuda12.1-py3.10-gcc9-sm86 / test (default, 1, 5,
linux.g5.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24446408907)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24446408907))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-cuda12.1-py3.10-gcc9-sm86 / test (default, 2, 5,
linux.g5.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24446409189)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24446409189))
`test_jit.py::TestScript::test_torchscript_multi_head_attn_fast_path`
* [pull / linux-focal-cuda12.1-py3.10-gcc9-sm86 / test (default, 3, 5,
linux.g5.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24446409446)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24446409446))

`test_transformers.py::TestTransformersCUDA::test_script_encoder_subclass_cuda`
* [pull / linux-focal-cuda12.1-py3.10-gcc9-sm86 / test (default, 4, 5,
linux.g5.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24446409676)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24446409676))

`test_transformers.py::TestTransformersCUDA::test_transformerencoderlayer_subclass_cuda`
* [pull / linux-focal-py3.11-clang10 / test (crossref, 1, 2,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445471589)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445471589))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-py3.11-clang10 / test (crossref, 2, 2,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445471884)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445471884))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.11-clang10 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445470929)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445470929))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-py3.11-clang10 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445471168)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445471168))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.11-clang10 / test (default, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445471397)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445471397))
`test_jit.py::TestScript::test_torchscript_multi_head_attn_fast_path`
* [pull / linux-focal-py3.11-clang10 / test (dynamo, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445472530)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445472530))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.12-clang10 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445428834)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445428834))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-py3.12-clang10 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445429085)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445429085))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.12-clang10 / test (dynamo, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445429974)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445429974))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.8-clang10 / test (crossref, 1, 2,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445479567)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445479567))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-py3.8-clang10 / test (crossref, 2, 2,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445479782)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445479782))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.8-clang10 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445478904)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445478904))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-focal-py3.8-clang10 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445479120)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445479120))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-focal-py3.8-clang10 / test (dynamo, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445480497)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445480497))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-jammy-py3.10-clang15-asan / test (default, 1, 6,
linux.4xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445500236)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445500236))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-jammy-py3.10-clang15-asan / test (default, 3, 6,
linux.4xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445500673)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445500673))

`test_transformers.py::TestTransformersCPU::test_transformerencoderlayer_subclass_model_cpu`
* [pull / linux-jammy-py3.10-clang15-asan / test (default, 4, 6,
linux.4xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445500892)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445500892))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-jammy-py3.10-clang15-asan / test (default, 5, 6,
linux.4xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445501108)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445501108))
`test_jit.py::TestScript::test_torchscript_multi_head_attn_fast_path`
* [pull / linux-jammy-py3.8-gcc11 / test (default, 1, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445495672)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445495672))
    `test_fx.py::TestVisionTracing::test_torchvision_models_vit_b_16`
* [pull / linux-jammy-py3.8-gcc11 / test (default, 2, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445495930)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445495930))

`test_transformers.py::TestTransformersCPU::test_script_encoder_subclass_cpu`
* [pull / linux-jammy-py3.8-gcc11 / test (default, 3, 3,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445496144)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445496144))
`test_jit.py::TestScript::test_torchscript_multi_head_attn_fast_path`
* [pull / linux-jammy-py3.8-gcc11 / test (jit_legacy, 1, 1,
linux.2xlarge)](https://hud.pytorch.org/pr/pytorch/pytorch/125225#24445496582)
([gh](https://github.com/pytorch/pytorch/actions/runs/8893561548/job/24445496582))

`test_jit_legacy.py::TestScript::test_torchscript_multi_head_attn_fast_path`
</p></details>

3. pytorch/executorch#3353, non-ghstack,
non-forked PR.

`{"3353":{"FAILED":[],"FLAKY":[],"BROKEN_TRUNK":[],"UNSTABLE":[]}}`

4. pytorch/pytorch#125292, ghstack, non-forked
PR.

<details open><summary><b>NEW FAILURE</b> - The following job has
failed:</summary><p>

* [inductor / cuda12.1-py3.10-gcc9-sm86 / test
(dynamic_inductor_torchbench, 2, 2,
linux.g5.4xlarge.nvidia.gpu)](https://hud.pytorch.org/pr/pytorch/pytorch/125292#24455309482)
([gh](https://github.com/pytorch/pytorch/actions/runs/8904802497/job/24455309482))
    `resnet18`
</p></details>
@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 3, 2024

This pull request was exported from Phabricator. Differential Revision: D56577399

@mcremon-meta mcremon-meta requested review from cccclai and tarun292 May 4, 2024 00:26
@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 6, 2024

This pull request was exported from Phabricator. Differential Revision: D56577399

mcremon-meta added a commit that referenced this pull request May 6, 2024
@mcremon-meta @facebook-github-bot
Cadence - Move primary code to backends folder (#3353)
a64f203 
Summary:
Pull Request resolved: #3353

See design and discussion in https://docs.google.com/document/d/1HPDTbN07WXB9PCdezmvSs_0Yy89D57F1pHHAF9UAgGg/edit#heading=h.828btb3wp67h.

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
```

Reviewed By: cccclai

Differential Revision: D56577399
@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 6, 2024

This pull request was exported from Phabricator. Differential Revision: D56577399

mcremon-meta added a commit that referenced this pull request May 6, 2024
@mcremon-meta @facebook-github-bot
Cadence - Move primary code to backends folder (#3353)
2d60b35 
Summary:
Pull Request resolved: #3353

See design and discussion in https://docs.google.com/document/d/1HPDTbN07WXB9PCdezmvSs_0Yy89D57F1pHHAF9UAgGg/edit#heading=h.828btb3wp67h.

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
```

Reviewed By: cccclai

Differential Revision: D56577399
@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 6, 2024

This pull request was exported from Phabricator. Differential Revision: D56577399

mcremon-meta added a commit that referenced this pull request May 6, 2024
@mcremon-meta @facebook-github-bot
Cadence - Move primary code to backends folder (#3353)
cfd90b7 
Summary:
Pull Request resolved: #3353

See design and discussion in https://docs.google.com/document/d/1HPDTbN07WXB9PCdezmvSs_0Yy89D57F1pHHAF9UAgGg/edit#heading=h.828btb3wp67h.

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
```

Reviewed By: tarun292, cccclai

Differential Revision: D56577399
@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 7, 2024

This pull request was exported from Phabricator. Differential Revision: D56577399

mcremon-meta added a commit that referenced this pull request May 7, 2024
@mcremon-meta @facebook-github-bot
Cadence - Move primary code to backends folder (#3353)
a90fc06 
Summary:
Pull Request resolved: #3353

See design and discussion in https://docs.google.com/document/d/1HPDTbN07WXB9PCdezmvSs_0Yy89D57F1pHHAF9UAgGg/edit#heading=h.828btb3wp67h.

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
```

Reviewed By: tarun292, cccclai

Differential Revision: D56577399
@mcremon-meta @facebook-github-bot
Cadence - Move primary code to backends folder (#3353)
eb3bc48 
Summary:
Pull Request resolved: #3353

See design and discussion in https://docs.google.com/document/d/1HPDTbN07WXB9PCdezmvSs_0Yy89D57F1pHHAF9UAgGg/edit#heading=h.828btb3wp67h.

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
```

Reviewed By: tarun292, cccclai

Differential Revision: D56577399
@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 7, 2024

This pull request was exported from Phabricator. Differential Revision: D56577399

@facebook-github-bot
Copy link
Copy Markdown
Contributor

facebook-github-bot commented May 7, 2024

This pull request has been merged in c001f59.

@Gasoonjia
Copy link
Copy Markdown
Contributor

Gasoonjia commented Jun 5, 2024

@pytorchbot cherry-pick --onto release/0.2 -c docs

@pytorchbot
Copy link
Copy Markdown
Collaborator

pytorchbot commented Jun 5, 2024

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"
Details for Dev Infra team Raised by workflow job

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cccclai cccclai Awaiting requested review from cccclai

1 more reviewer

@tarun292 tarun292 tarun292 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. fb-exported Merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mcremon-meta @facebook-github-bot @Gasoonjia @pytorchbot @tarun292