Pycaffe fixes and example reformation #2058
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
| @@ -104,15 +104,20 @@ def main(argv): | |||
|
|
|||
| if args.gpu: | |||
| print('GPU mode') | |||
| else: | |||
| print 'CPU mode' | |||
There was a problem hiding this comment.
Right -- thanks for the reminder. This was just a cherry-pick so I'm still making changes and combing over.
shelhamer
force-pushed
the
py-fixes
branch
2 times, most recently
from
9f949a5 to
da26c85
Compare
This was referenced Mar 7, 2015
...and fix up detector quote convention.
Closed
- download CaffeNet if it isn't there - switch to caffe.Net - reshape net for single input - explain param, bias indexing - update output for N-D blobs
- N-D blob parameter dimensions - add filtering section to net surgery example - make Gaussian blur and Sobel edge kernels - alter biases - do flat assignment instead of reshape and explain memory layout - make dir for surgery files
- add a little explanation - solve from Python and the command line - time scikit-learn and caffe - fix test iterations (number of instances / batch size)
call forward to warm-start the demo so the first request isn't slow.
|
@longjon I'm merging these fixes to the broken parts of pycaffe and examples but the real switch to |
shelhamer
added a commit
that referenced
this pull request
Mar 9, 2015
Pycaffe fixes and example reformation
Closed
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 recent issues with pycaffe examples.
The
caffe.Netinterface and solver are the core of pycaffe. TheClassifierandDetector"convenience" classes were a mistake on my part that seem to have mostly confused. To better illustrate the main interface this PR will switch tocaffe.Netthroughout (or at least take steps in that direction).everywhereexcept for classification and detection examplesNext up
caffe.Neteverywhere and deprecateClassifier,Detectorcaffe.Net,caffe.io, solver interface