Rebase to latest master branch #1
Open
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
- condense conditions by `LOG_IF` - only log memory use once after all tops
[style] Clean Up Logging for Net Init
Solver Refactor: Separate files and Change Solver's Type to String
…he kernel Now PReLU backward is taking the same time as forward Code cleanup Removed unnecessary code Fixed indent merge if(channed_shared_)
[build] Qualify messages issued by CMake when CUDA is unavailable
[docs] direct installation questions to caffe-users
[docs] mark cuDNN v3 compatible
[test] drop bogus OpenCV guard for layer type
PReLU speed up
[example] Fix class label index error in tutorial 00.
Set policies to NEW to silence warnings in CMake 3.02 and later.
Open LMDB files with MDB_NOLOCK if no write access
Clean includes
this code seems not to apply to the caffe head.
```
if diff.ndim != 4:
raise Exception('{} diff is not 4-d'.format(top))
```
diff.ndim != 4 is outdated
Project does not compile without opencv_imgcodecs in the library path if you're using OpenCV 3. This introduces a OPENCV_VERSION flag in Makefile.config that includes the library if set to 3. (Trying to include it with OpenCV 2 also breaks the build)
Add opencv_imgcodecs to library path in Makefile
Yet another batch normalization PR
Use six library to ensure pycaffe.py python3 compliance
…lob-float-no-register [pycaffe] fix boost 1.60 compatibility issue; close BVLC#3494
This is temporary measure to avoid an apparent upstream issue with protobuf 3.0.0b2.post1.
Travis: force protobuf 3.0.0b2 for Python 3
This provides a framework for automatically aligning different layers of a net despite up/downsampling, padding, and output size rounding.
Removed lint script reference to non-existant caffe_memcpy function.
- document by docstring and comment - pep8 - add latest layers and alphabetize - respect default crop params - handle graphs with compositions of crops by walking only the first, cropped bottom of Crop layers - make python3 happy by replacing arg tuple unpacking
- crop -> offset - adjust crop axis by 1
- test known mappings: conv-pool-deconv stack, ReLU and 1x1 conv - test effects of padding - test rectangular/anisotropic coordinate mapping, test N-D - catch error cases: negative crop, scale mismatch, tops that are not spatially connected
configure offset(s) through proto definition.
Changes are: reduce test blob dims for speed use standard Gaussian filler, polish formatting and rename tests, test HW crop and 5D crop, standard gradient checks
ND Crop layer
Python/net spec coordinate map and crop offset computation
Refine P2PSync
Add functions to check and grab GPU
|
@weiliu89 For parseNet to function on master we would still be missing:
|
sasadep
pushed a commit
to sasadep/caffe
that referenced
this pull request
Aug 29, 2016
fix caffe time command.
JeffOwOSun
added a commit
to CK2-2016/caffe
that referenced
this pull request
Sep 28, 2016
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.
Hi @weiliu89 ,
This is a re-base of all fcn layers to the latest caffe master, plus the solver modification. Each added layer is squashed into one commit. The modified pooling layer was re-named to as binpooling layer, however it should be able to replace this binpooling layer with a SPP pooling layer. It would be great if you could have a look at this.
BR, Max