resolve merge conflicts between crop-layer and BVLC:master #2
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
Fixup AccuracyLayer like SoftmaxLossLayer in BVLC#1970
See BVLC model license details on the model zoo page. [Re-commit of 6b84206 which somehow went missing.]
described in Kaiming He et al, "Delving Deep into Rectifiers: Surpassing Human-Level Performance on ImageNet Classification", arxiv 2015. Belows are commit message histories that I had while developing. PReLULayer takes FillerParameter for init PReLU testing consistency with ReLU Fix : PReLU test concistency check PReLU tests in-place computation, and it failed in GPU Fix: PReLU in-place backward in GPU PReLULayer called an incorrect API for copying data (caffe_gpu_memcpy). First argment of `caffe_gpu_memcpy` should be size of memory region in byte. I modified to use `caffe_copy` function. Fix: style errors Fix: number of axes of input blob must be >= 2 Use 1D blob, zero-D blob. Rename: hw -> dim
Add PReLU Layer
Since it's removed from Homebrew [1]. [1]: Homebrew/legacy-homebrew@8cdf4d8
Shuffle HDF5 data
Use ReadNetParamsFromBinaryFileOrDie to read a net param when restoring from a saved solverstate, which upgrades old nets, rather than ReadProtoFromBinaryFile.
Fix invalid syntax on classify.py
Cross-channel LRN bounds checking for GPU implementation
There are no cases where Forward is called without Reshape, so we can simplify the call structure.
Typos in documents
Give cuDNN {0, 1} constants for controlling accumulation through the
alpha and beta coefficients.
change resorce to resource
2.7.0 isn't really necessary - 2.3.0 is sufficient. This is the version available on Ubuntu 14.04 via apt-get, and seems to be a reasonable lowest common denominator in general. http://pillow.readthedocs.org/installation.html#old-versions
bundle CVPR15 tutorial notebooks
This filler is a convenience for interpolating with DeconvolutionLayer or smoothing + downsampling with ConvolutionLayer for stride > 1.
add bilinear interpolation filler
[docs] install boost without recommends to avoid conflicts -- close BVLC#2454
…package managers for both 14.04 and 12.04)
No functional changes, just fixing whitespace errors and typos in comments
[build] fix CMake typos
Making the net_spec python3 compatible
List protobuf-compiler dependency in the correct place (it is in the …
Also more readable and compatible with format of instructions for MNIST https://github.com/BVLC/caffe/tree/master/examples/mnist
Removes a unused variable warning
Update net_layer_blob.md
examples/imagenet: fix broken link
One command less in CIFAR10 documentation
tiny fix in Layer::Backward documentation
[build] Travis scripts for python3 and pytest for cmake.
|
Thanks for offering the merge but we have posted an updated |
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.
@shelhamer Thanks for the useful features.
The merging of
SPPLayerinto BVLC:master causes a merge conflict between your crop-layer branch and BVLC:master. I suspect the branch is not ready to be merged into BVLC:master yet but it's already become relevant for trying out the FCN models.So this PR just resolves the conflict by disentangling the
SPPLayerandCropLayerclass definitions in the vision_layer header.The list of commits that github shows for this PR is a bit overwhelming. The commits for resolving the merge conflict can be seen here.