Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update xnnpack to newer version and update API usage in pytorch #94330

Closed
wants to merge 1 commit into from

Conversation

tiandiao123
Copy link
Contributor

@tiandiao123 tiandiao123 commented Feb 7, 2023

Summary:
Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai

Differential Revision: D43092938

cc @jgong5 @mingfeima @XiaobingSuper @sanchitintel @ashokei @jingxu10 @albanD

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Feb 7, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: tiandiao123 / name: Cuiqing Li (6b67439)

@pytorch-bot
Copy link

pytorch-bot bot commented Feb 7, 2023

🔗 Helpful Links

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

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

✅ No Failures

As of commit c441e53:
💚 Looks good so far! There are no failures yet. 💚

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

@facebook-github-bot
Copy link
Contributor

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

@github-actions github-actions bot added the module: cpu CPU specific problem (e.g., perf, algorithm) label Feb 7, 2023
@digantdesai digantdesai added module: xnnpack and removed release notes: quantization release notes category labels Feb 7, 2023
@kirklandsign
Copy link
Contributor

/easycla

1 similar comment
@tiandiao123
Copy link
Contributor Author

/easycla

@tiandiao123
Copy link
Contributor Author

tiandiao123 commented Feb 7, 2023

@albanD @seemethere
hello we are updating our diff to update xnnpack, but pytorch repo onlu allows 2000 lines codes' change. But I think since we are updating our new version of xnnpack, we cannot shrink it into smaller size, could you give us an exception?

tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 8, 2023
…rch#94330)

Summary:
Pull Request resolved: pytorch#94330

Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

This commit needs to allow large files to be committed since we are updating newer xnnpack version.

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai

Differential Revision: D43092938

fbshipit-source-id: 6fa5028544533ce40ce1b4b91d57524bc88a3f8c
@facebook-github-bot
Copy link
Contributor

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

@github-actions github-actions bot added the release notes: quantization release notes category label Feb 8, 2023
@tiandiao123
Copy link
Contributor Author

/easycla

@tiandiao123
Copy link
Contributor Author

@albanD @seemethere hello we are updating our diff to update xnnpack, but pytorch repo onlu allows 2000 lines codes' change. But I think since we are updating our new version of xnnpack, we cannot shrink it into smaller size, could you give us an exception?

@albanD or @seemethere

@albanD
Copy link
Collaborator

albanD commented Feb 8, 2023

What's the difference with #94230 ? The questions there are still relevant to this PR right?

@tiandiao123
Copy link
Contributor Author

@albanD or @seemethere

that one can be closed, we actually combined 4 diffs into single one. This should be official for us @kirklandsign @digantdesai

@facebook-github-bot
Copy link
Contributor

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

tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 8, 2023
…rch#94330)

Summary:
Pull Request resolved: pytorch#94330

Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

This commit needs to allow large files to be committed since we are updating newer xnnpack version.

allow-large-files
allow-large-files

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai

Differential Revision: D43092938

fbshipit-source-id: a5134699b3998e698049bcdc4dc081eef2523ee8
@albanD
Copy link
Collaborator

albanD commented Feb 8, 2023

Any reason why the script to generate this bzl files is not here? We could have it in our scripts/ folder to make sure we don't loose it.

Also are these bzl files used by the (open source) bazel build? FYI @vors

Copy link
Contributor

@digantdesai digantdesai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@facebook-github-bot
Copy link
Contributor

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

tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 9, 2023
…rch#94330)

Summary:
Pull Request resolved: pytorch#94330

Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

This commit needs to allow large files to be committed since we are updating newer xnnpack version.

allow-large-files
allow-large-files
allow-large-files
allow-large-files
allow-large-files

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai, albanD

Differential Revision: D43092938

fbshipit-source-id: 9cf2ffe79a0c03aab5da907f3ed106d6f24cae76
@facebook-github-bot
Copy link
Contributor

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

tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 10, 2023
…rch#94330)

Summary:
Pull Request resolved: pytorch#94330

Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

This commit needs to allow large files to be committed since we are updating newer xnnpack version.

allow-large-files
allow-large-files
allow-large-files
allow-large-files
allow-large-files

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai, albanD

Differential Revision: D43092938

fbshipit-source-id: 0fdf94d11dad8ec6b6a8d3d123e0d099d6c60d16
@facebook-github-bot
Copy link
Contributor

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

tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 10, 2023
…rch#94330)

Summary:
Pull Request resolved: pytorch#94330

Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

This commit needs to allow large files to be committed since we are updating newer xnnpack version.

allow-large-files
allow-large-files
allow-large-files
allow-large-files
allow-large-files

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai, albanD

Differential Revision: D43092938

fbshipit-source-id: 499ca3d7a4d05dc5c9f22747d7e7453da1871ced
…rch#94330)

Summary:
Pull Request resolved: pytorch#94330

Update XNNPACK to 51a987591a6fc9f0fc0707077f53d763ac132cbf (https://github.com/google/XNNPACK/commits/51a987591a6fc9f0fc0707077f53d763ac132cbf)

Update the corresponding CMake and BUCK rules, as well as the generate_wrapper.py for the new version.

Due to XNNPACK having already changed a lot. We need to update XNNPACK in this time for many reasons. Firstly, XNNAPCK has updated a lot, and developers' community has re-factored codes' such as API changes. We can see from their cmakefile.txt to see there are many changes! Thus, in order to follow up upstream. We need to update xnnpack at this time. It is very crucial for our future development. Also, many projects are relying on newer versions of XNNPACK, so we probably need to update XNNPACK third-party libs at this time. we have some api changes of XNNPACK, so we also need to update them in this time. We also update target building files and generate-wrapper.py file to make this process more automatically. The original target files have some files which are missing, so we add them into buck2 building files so that it can build and test XNNPACK successfully.

This commit needs to allow large files to be committed since we are updating newer xnnpack version.

allow-large-files
allow-large-files
allow-large-files
allow-large-files
allow-large-files

Test Plan:
buck2 build //xplat/third-party/XNNPACK:operators
buck2 build //xplat/third-party/XNNPACK:XNNPACK
buck2 test fbcode//caffe2/test:xnnpack_integration

Reviewed By: digantdesai, albanD

Differential Revision: D43092938

fbshipit-source-id: 8272634c896dae428845fc4ed16d02e12cd5591a
@facebook-github-bot
Copy link
Contributor

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

@facebook-github-bot
Copy link
Contributor

@pytorchbot merge -f 'Landed internally'

(Initiating merge automatically since Phabricator Diff has merged, using force because this PR might not pass merge_rules.json but landed internally)

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@malfet
Copy link
Contributor

malfet commented Feb 13, 2023

This PR broke periodic builds, as it missed ciflow/periodic. I guess one need to update https://github.com/pytorch/pytorch/blob/master/third_party/generate-xnnpack-wrappers.py but I'm not sure if it's used correctly here

@tiandiao123
Copy link
Contributor Author

This PR broke periodic builds, as it missed ciflow/periodic. I guess one need to update https://github.com/pytorch/pytorch/blob/master/third_party/generate-xnnpack-wrappers.py but I'm not sure if it's used correctly here

we are investigating it.

tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 14, 2023
Summary:
Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: dea4b037a7dba33e382607a5d5d9dfa7e2d48db7
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 14, 2023
Summary:
Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: 46d36345ca8d2b4b8c4031b574e33c23361729e7
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 14, 2023
Summary:
Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: 81d30f161fa66fc74ed5e2f2ca57948f5e1caa48
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 14, 2023
Summary:
we are trying to fix OSS CI caused by pytorch#94330

Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: e4d0a9ff6218d6732540982efa3242cbf82148b8
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 14, 2023
Summary:
we are trying to fix OSS CI caused by pytorch#94330

Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: 045508402b1575bea17bda4d1aab3b03130bf0e9
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 15, 2023
Summary:
we are trying to fix OSS CI caused by pytorch#94330

Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: 9bd42f6d6685367e3dd4fea2eb418f8e24397683
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 15, 2023
Summary:
we are trying to fix OSS CI caused by pytorch#94330

Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Differential Revision: D43259005

fbshipit-source-id: 612d039da557eb5818a78c41daf49c7256d1eaf6
tiandiao123 pushed a commit to tiandiao123/pytorch that referenced this pull request Feb 15, 2023
Summary:
we are trying to fix OSS CI caused by pytorch#94330

Pull Request resolved: pytorch#94785
Fix CI errors for pytorch open source CI passing

Here are some errors we are trying to fix: https://www.internalfb.com/phabricator/paste/view/P622309998, like some missing symbols and linking issues

Test Plan: buck2 test fbcode//caffe2:test_xnnpack_delegate

Reviewed By: weiwangmeta

Differential Revision: D43259005

fbshipit-source-id: df221349ffa314ade6338e9de058102942a23214
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants