forked from BVLC/caffe
-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Semantic segmentation future merge master #11
Closed
ahundt
wants to merge
337
commits into
longjon:future
from
ahundt:semantic-segmentation-future-merge-master
Closed
Semantic segmentation future merge master #11
ahundt
wants to merge
337
commits into
longjon:future
from
ahundt:semantic-segmentation-future-merge-master
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
This option lets you open LMDB files with the MDB_NOLOCK flag. You should not set this flag if you will be reading LMDBs with any possibility of simultaneous read and write.
Ensure consistency between memory alloc and free
According to the Debian policy manual, "Shared libraries should not be installed executable, since the dynamic linker does not require this and trying to execute a shared library usually results in a core dump." https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-runtime
Fix a typo in the message.
Fix a typo
Add argmax_param "axis" to maximise output along the specified axis
add badge for travis build and license
Useful for exporting models from MATLAB (e.g. MatConvNet) to Caffe
Add a caffe.io.write_mean function to the MATLAB interface
SilenceLayer Backward bugfix (fixes BVLC#3151)
…fixes Documentation References ImageNet Sample Location
Remove the 4D constraint of blobproto IO in python
Improve numerical stability of variance computation in MVNLayer
Fixed a bug in two assertions (the condition input argument must be a scalar logical)
Update store2hdf5.m
In getting the [web demo](http://caffe.berkeleyvision.org/gathered/examples/web_demo.html) started I get an `ImportError: No module named yaml` error when running `./scripts/download_model_binary.py models/bvlc_reference_caffenet`.
[example] Add pyyaml as a requirement for web demo
BatchReindexLayer to shuffle, subsample, and replicate examples in a batch
…entation-future-merge-master crop_layer moved to its own header in include/caffe/layers/crop_layer.hpp. vision_layers.hp and common_layers.hpp removed again. other relevant header paths updated. Previous Merge Information: # Conflicts: # README.md # include/caffe/common_layers.hpp # include/caffe/layer.hpp # include/caffe/neuron_layers.hpp # include/caffe/vision_layers.hpp Commit: 0336d08 [0336d08] Parents: 6e39167, 4541f89 Author: Andrew Hundt <ATHundt@gmail.com> Date: February 23, 2016 at 12:54:49 AM EST Labels: HEAD -> semantic-segmentation-future-merge-master
8 tasks
…). Replacing it with accessing Blob.shape[0] - for Blobs with num_axes() != 4
- add subheadings and list steps - edit text, add comments, and try to make the code more understandable - add new section for summary and encouragement to try your own image
- add subheadings and list steps for structure - edit text and comments for clarity - switch paths and use chdir for idempotency of scripts [shelhamer] - title accuracy plots, rename ip -> fc to fit common naming, and rename output layer -> score [shelhamer] - add experimentation section [shelhamer]
- add headings and text detail - make nets by net spec - define solvers inline through python protobuf - do two-stage fine-tuning (first last layer alone, then end-to-end) - show sample results
- create solvers inline through python protobuf - drop manually written solver prototxt - remove ordering prefix, since there is no real sequencing constraint for this example
This is important for the include order. Without this patch, a previously installed caffe.pb.h might be included instead of the one that is generated during the build.
[example] Improve Tutorial Notebooks on Classification, Learning LeNet, and Fine-tuning
[pycaffe] make pycaffe support N-D blobs throughout
CMake: Do not include "${PROJECT_BINARY_DIR}/include" with SYSTEM option
Tied weights with transpose flag for InnerProduct layer
Create an input layer to replace oddball Net `input` fields.
Drop special cases for `input` fields, the `Net` input members, and the `Net` interface for Forward with bottoms along with Forward() / ForwardPrefilled() distinction.
Restore the list of net inputs for compatibility with the pycaffe and matcaffe interfaces and downstream C++.
Relax removal of `Forward()` variations by deprecating instead.
Add Input Layer to Replace `input`s
These can be used as direct replacements for the Caffe executable.
[build] Add docker images for running caffe out-of-the-box (caffe:cpu, caffe:gpu)
nvidia-docker requires long args with equal sign as of docker 1.10: see BVLC#3518 (comment)
Fix flags for nvidia-docker from BVLC#3518
fixing lint errors
supporting N-D Blobs in Dropout layer Reshape
@ahundt thanks for the merge, but the FCN crop layer and coordinate mapping tools have been merged to master. See https://github.com/shelhamer/fcn.berkeleyvision.org for details on reference FCNs for the master branch. |
@shelhamer fantastic! Thanks for setting up https://github.com/shelhamer/fcn.berkeleyvision.org ! |
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.
I merged the current master and moved some of the files appropriately. I know there are a bunch of independent pull requests to merge the different functional components separately so this probably will never be permanently merged.
Nonetheless, this merge will probably let people use the fully convolutional networks while breaking things less until the fully reviewed merges in BVLC/caffe are done!