Reuse GELU implementation from PyTorch core by pytorchbot · Pull Request #8322 · pytorch/executorch

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

pytorchbot · 2025-02-07T23:03:59Z

This PR was created by the merge bot to help merge the original PR into the main branch.
ghstack PR number: #7041
^ Please use this as the source of truth for the PR details, comments, and reviews
ghstack PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/120/base
ghstack PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/head
Merge bot PR base: https://github.com/pytorch/executorch/tree/gh/swolchok/124/orig
Merge bot PR head: https://github.com/pytorch/executorch/tree/gh/swolchok/120/orig
@diff-train-skip-merge

pytorch-bot · 2025-02-07T23:04:03Z

🔗 Helpful Links

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

📄 Preview Python docs built from this PR

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

❌ 1 New Failure, 5 Pending

As of commit 2c10b96 with merge base 89dc36c ():

NEW FAILURE - The following job has failed:

Lint / lintrunner / linux-job (gh)
>>> Lint for backends/cadence/aot/export_example.py:

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

lucylq · 2025-02-11T19:20:18Z

Updated the base to main

swolchok · 2025-02-11T19:28:01Z

I discovered one typo during conflict resolution already, waiting for at least unittest jobs to come back

swolchok · 2025-02-11T19:51:32Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

swolchok · 2025-02-11T19:59:44Z

trying to see if the following workflow reproduces:

pip uninstall torch
check out the pinned pytorch commit in local pytorch, python setup.py develop
go back to executorch, ./install_executorch.py --pybind xnnpack --use-pt-pinned-commit

swolchok · 2025-02-11T20:11:03Z

following workflow reproduces

nope. install_executorch.py uninstalls torch installed this way. also getting ImportError: /data/users/swolchok/pytorch/torch/lib/libtorch_python.so: undefined symbol: _PyThreadState_GetCurrent so apparently the way I'm building pytorch is somehow wrong :\

huydhn · 2025-02-11T20:59:07Z

I cannot repro the build failures on this PR with a linux machine. ./install_executorch.sh --pybind xnnpack --use-pt-pinned-commit is failing; no repro with or without --use-pt-pinned-commit. (I am not running the full CI flow and I am using venv instead of conda, which may be why.) @huydhn they're MKL-related and you touched MKL lately, any ideas? diff train is blocked :\

I haven't been able to connect the dots yet, but let me take a closer look

While debugging the build issue on #8322 w.r.t mkl, I undercover a complex interaction between #8322, #8248 (to install mkl), and https://github.com/pytorch/pytorch/blob/main/cmake/public/mkl.cmake from PyTorch. The error is as follows: ``` CMake Error at /opt/conda/envs/py_3.10/lib/cmake/mkl/MKLConfig.cmake:744 (add_library): <-- This file comes from conda mkl add_library cannot create imported target "MKL::MKL" because another target with the same name already exists. Call Stack (most recent call first): /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/public/mkl.cmake:1 (find_package) <-- this is from PyTorch /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Caffe2/Caffe2Config.cmake:106 (include) /opt/conda/envs/py_3.10/lib/python3.10/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package) CMakeLists.txt:753 (find_package) ``` The conclusion is that, with mkl installed, there should be just one `find_package(Torch)` call because the mkl target is defined globally. The `torch` target, on the other hand, is only defined locally. So, this change adds `if(NOT TARGET torch)` check to only call `find_package(Torch)` if needed. ### Testing The change on top of #8322 looks like this f705b01https://github.com/pytorch/executorch/actions/runs/13278590926?pr=8399

swolchok · 2025-02-12T17:56:14Z

rebased the branch locally, fixed conflicts, and force-pushed. hopefully we should acutlaly have picked up #8407 and will be able to land soon.

Pull Request resolved: #7041 kernels/optimized doesn't need to support embedded systems, so it can just take a header-only dep on PyTorch. Note that, because we will pick up Sleef internally and ignore it externally thanks to ATen vec, this PR gets to enable optimized GELU in OSS. Testing: CI to make sure this doesn't break mobile build modes; happy to take advice on anything not currently covered that might break. ghstack-source-id: 265190627 @exported-using-ghexport Differential Revision: [D66335522](https://our.internmc.facebook.com/intern/diff/D66335522/)

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 Feb 7, 2025

swolchok requested review from kirklandsign and tarun292 February 11, 2025 19:10

lucylq approved these changes Feb 11, 2025
View reviewed changes

tarun292 approved these changes Feb 11, 2025
View reviewed changes

Base automatically changed from gh/swolchok/124/orig to mainFebruary 11, 2025 19:19

lucylq added the topic: not user facing label Feb 11, 2025

kirklandsign approved these changes Feb 11, 2025
View reviewed changes

github-actionsBot mentioned this pull request Feb 11, 2025
Weekly pr metrics report - 2025-02-01..2025-02-07 wdvr/pytorch#6
Open

huydhn mentioned this pull request Feb 12, 2025
Fix multiple find_package(Torch) calls #8407
Merged

swolchok force-pushed the gh/swolchok/120/orig branch from d7c261d to 0d95292Compare February 12, 2025 17:55

swolchok added the ciflow/trunk label Feb 12, 2025

Github Executorchand others added 3 commits February 12, 2025 11:34

apply@huydhn's fix to new code
57f2265

extra tweak from@huydhn
2c10b96

swolchok force-pushed the gh/swolchok/120/orig branch from b9e7ddb to 2c10b96Compare February 12, 2025 19:43

swolchok merged commit 6727fea into mainFeb 12, 2025

swolchok deleted the gh/swolchok/120/orig branch February 12, 2025 20:35

github-actionsBot mentioned this pull request Feb 17, 2025
Weekly pr metrics report - 2025-02-01..2025-02-07 wdvr/pytorch#8
Open

This was referenced Feb 24, 2025
Weekly pr metrics report - 2025-02-01..2025-02-07 wdvr/pytorch#10
Open
Weekly pr metrics report - 2025-02-01..2025-02-07 wdvr/pytorch#14
Open