This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
Include all mkldnn headers in CD builds #18355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey @leezu , Thanks for submitting the PR
CI supported jobs: [centos-gpu, windows-gpu, unix-cpu, miscellaneous, website, unix-gpu, sanity, centos-cpu, clang, windows-cpu, edge] Note: |
TaoLv
reviewed
May 19, 2020
| set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE INTERNAL "" FORCE) | ||
|
|
||
| if(NOT USE_OPENMP) | ||
| function(load_mkldnn) |
There was a problem hiding this comment.
Why need put them into a function?
There was a problem hiding this comment.
Functions have their own scope in cmake. We don't want to change any of the settings outside of this function (such as the install target name for the include files)
There was a problem hiding this comment.
So it's really about setting the CMAKE_INSTALL_INCLUDEDIR differently for mkldnn which is introduced in this PR
| include_directories(3rdparty/mkldnn/include) | ||
| include_directories(${PROJECT_BINARY_DIR}/3rdparty/mkldnn/include) | ||
| add_definitions(-DMXNET_USE_MKLDNN=1) | ||
| list(APPEND mxnet_LINKER_LIBS dnnl) | ||
| set(INSTALL_MKLDNN ON) |
There was a problem hiding this comment.
This variable isn't used anywhere but in this line
TaoLv
approved these changes
May 19, 2020
MoisesHer
pushed a commit
to MoisesHer/incubator-mxnet
that referenced
this pull request
Jun 23, 2020
* Fix cmake mkldnn install target. Previously mkldnn headers are installed to CMAKE_INSTALL_INCLUDEDIR instead of CMAKE_INSTALL_INCLUDEDIR/mkldnn * Fix pypi_package.sh pip/setup.py for mkldnn builds
AntiZpvoh
pushed a commit
to AntiZpvoh/incubator-mxnet
that referenced
this pull request
Jul 6, 2020
* Fix cmake mkldnn install target. Previously mkldnn headers are installed to CMAKE_INSTALL_INCLUDEDIR instead of CMAKE_INSTALL_INCLUDEDIR/mkldnn * Fix pypi_package.sh pip/setup.py for mkldnn builds
sandeep-krishnamurthy
pushed a commit
that referenced
this pull request
Jul 20, 2020
* cherry-pick: Fix missing MKLDNN headers (#18310) * Include all mkldnn headers in CD builds (#18355) * Fix cmake mkldnn install target. Previously mkldnn headers are installed to CMAKE_INSTALL_INCLUDEDIR instead of CMAKE_INSTALL_INCLUDEDIR/mkldnn * Fix pypi_package.sh pip/setup.py for mkldnn builds * Set CMAKE_CUDA_COMPILER in aarch64-linux-gnu-toolchain.cmake (#18713) CMAKE_CUDA_HOST_COMPILER will be reset if CMAKE_CUDA_COMPILER is not set as of cmake 3.17.3 See https://gitlab.kitware.com/cmake/cmake/-/issues/20826 Co-authored-by: Leonard Lausen <[email protected]>
ChaiBapchya
pushed a commit
to ChaiBapchya/mxnet
that referenced
this pull request
Jul 27, 2020
* cherry-pick: Fix missing MKLDNN headers (apache#18310) * Include all mkldnn headers in CD builds (apache#18355) * Fix cmake mkldnn install target. Previously mkldnn headers are installed to CMAKE_INSTALL_INCLUDEDIR instead of CMAKE_INSTALL_INCLUDEDIR/mkldnn * Fix pypi_package.sh pip/setup.py for mkldnn builds * Set CMAKE_CUDA_COMPILER in aarch64-linux-gnu-toolchain.cmake (apache#18713) CMAKE_CUDA_HOST_COMPILER will be reset if CMAKE_CUDA_COMPILER is not set as of cmake 3.17.3 See https://gitlab.kitware.com/cmake/cmake/-/issues/20826 Co-authored-by: Leonard Lausen <[email protected]>
szha
pushed a commit
that referenced
this pull request
Aug 3, 2020
* Cherry-pick #18310 #18355 (#18608) * cherry-pick: Fix missing MKLDNN headers (#18310) * Include all mkldnn headers in CD builds (#18355) * Fix cmake mkldnn install target. Previously mkldnn headers are installed to CMAKE_INSTALL_INCLUDEDIR instead of CMAKE_INSTALL_INCLUDEDIR/mkldnn * Fix pypi_package.sh pip/setup.py for mkldnn builds * Set CMAKE_CUDA_COMPILER in aarch64-linux-gnu-toolchain.cmake (#18713) CMAKE_CUDA_HOST_COMPILER will be reset if CMAKE_CUDA_COMPILER is not set as of cmake 3.17.3 See https://gitlab.kitware.com/cmake/cmake/-/issues/20826 Co-authored-by: Leonard Lausen <[email protected]> * remove linux-gputoolchain Co-authored-by: MoisesHer <[email protected]> Co-authored-by: Leonard Lausen <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #18120 specifically #18120 (comment)