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

fix cpuinfo branch #214

Merged
merged 2 commits into from
Feb 1, 2023
Merged

fix cpuinfo branch #214

merged 2 commits into from
Feb 1, 2023

Conversation

wm901115nwpu
Copy link
Contributor

No description provided.

CMakeLists.txt Outdated
@@ -36,7 +36,7 @@ ENDMACRO()
MACRO(NNPACK_TARGET_ENABLE_CXX11 target)
IF(${CMAKE_VERSION} VERSION_LESS "3.1")
IF(NOT MSVC)
TARGET_COMPILE_OPTIONS(${target} PRIVATE -std=gnu++11)
TARGET_COMPILE_OPTIONS(${target} PRIVATE -std=gnu++11 -fPIC)
Copy link
Owner

Choose a reason for hiding this comment

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

This is unrelated, please revert

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have fixed it.

@Maratyszcza Maratyszcza merged commit 70a77f4 into Maratyszcza:master Feb 1, 2023
Liam-Sturge added a commit to Liam-Sturge/tvm that referenced this pull request Feb 3, 2023
This patch undoes the change that was put in place to prevent the build
and installation of NNPACK from failing due to a renaming of the default
branch to main by the NNPACK external dependency cpuinfo.

See apache#13871

The issue has been fixed at the source by PR apache#214, so the change to
`ubuntu_install_nnpack.sh` is no longer required:

Maratyszcza/NNPACK#214
driazati pushed a commit to apache/tvm that referenced this pull request Feb 7, 2023
This patch undoes the change that was put in place to prevent the build and installation of NNPACK from failing due to a renaming of the default branch to main by the NNPACK external dependency cpuinfo.

See #13871

The issue has been fixed at the source by PR #214 which is now merged in to NNPACK, so the change to `ubuntu_install_nnpack.sh` is no longer required:

Maratyszcza/NNPACK#214
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants