[Caffe] Minor refactoring of NNPACK integration #1
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
The approach is pretty straightforward and very similar to the CuDNN integration: - Add some CMake magic to detect NNPACK if it's installed on the user's system. - Add some Makefile.config options - Add some thread-local state (a threadpool for NNPACK to caffe::Caffe). - Add an NNPACK `Engine` parameter to Convolution/Pooling/InnerProduct layers. - In LayerFactory, ifdef around whether NNPACK is enabled and dispatch to NNPACK*Layer or *Layer depending on the Engine parameter. - In NNPACK*Layer, ensure the NNPACK preconditions hold and call the appropriate nnpack_* function, otherwise fall back to *Layer. I'm not sure how common it is to be running CNN inference on Haswell and beyond CPUs for Caffe users, but if it is it might be a nice boost for them.
- Moved headers for NNPACK layers from src/caffe/layers to include/caffe/layers - Detect situations not handled by nnp_max_pooling_output from its return code, rather than hard-code them in the integration code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix two of the issues mentioned in Maratyszcza/NNPACK#1