Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Next: dev @ 25.02.14 into master #167

Merged
merged 49 commits into from
Feb 26, 2014
Merged

Next: dev @ 25.02.14 into master #167

merged 49 commits into from
Feb 26, 2014

Conversation

shelhamer
Copy link
Member

Bring some of the latest developments into the fold as of the witching hour Feb. 25 '14.

@shelhamer
Copy link
Member Author

Be aware this might look like a slightly odd merge in the end because of the game we played with reverting the first broken edition of DAGs.

Don't worry about it.

@shelhamer
Copy link
Member Author

Can't Merge Linting: python wrapper is broken. Tested ok up to bca6595. #163 will stay in dev for now.

A lint fix gone awry? @jeffdonahue

@jeffdonahue
Copy link
Contributor

sigh...maybe someday I'll contribute without breaking huge pieces of Caffe...sorry! And nice catch! I think this should be fixed by #168 -- please test again and let me know.

sguada and others added 22 commits February 26, 2014 12:36
@sguada @shelhamer
Set leveldb options.max_open_files = 100. Fix #13 and #38
5b333e6
@shelhamer
Merge pull request #154 from sguada/leveldb_max_open_files
fe98dd5
@t-abe @shelhamer
Fix error message typo in SoftmaxWithLossLayer
d7ca483
@shelhamer
Merge pull request #164 from t-abe/fix-typo
bab8f6d
@shelhamer
move imagenet splits + synsets to data
6cc0c47
@shelhamer
add imagenet mean file
b09adf7
@shelhamer
file mnist
650b7b1
@shelhamer
Make tools/ for core binaries, stow scripts/ in tools/extra
4f1cdeb 
Collect core Caffe tools like train_net, device_query, etc. together in
tools/ and include helper scripts under tools/extra.
@shelhamer
fix mnist comments in cifar example
8806380
@shelhamer
file models
2ec698b
@shelhamer
explain ignore, and ignore data, models, and examples
e155a2d 
Data, models, and examples should not be versioned by default. Reference
versions of these are not to be casually committed.

Plus this makes for a better playground in examples without having to
worry about data, intermediate files, or experiments being accidentally
tracked.
@shelhamer
swap ilsvrc data with fetch script
879868e
@shelhamer
fetch caffe_reference_imagenet_model
3230b5a
@shelhamer
include model checksum, you never know these days
4fd2fa2
@shelhamer
everything in its right place
04f61b3
@shelhamer
TODO cifar example
9b3f2d9
@shelhamer
fix mnist, add deploy net example
20833e0
@shelhamer
harmonize imagenet example, name caffe reference model CaffeNet
bb07c06
@shelhamer
fix + rename lenet training script
026ccd7
@shelhamer
bring mnist docs back to reality
cd6df9e
@shelhamer
bring imagenet docs back to reality
9b2aca4 
- fix paths
- replace shell command blocks with scripts
- file ipython notebooks in examples
- proofread
@shelhamer
Merge pull request #142 from shelhamer/data-aux
f0b76ea 
Sort out models, data, examples, and tools
@shelhamer shelhamer closed this Feb 26, 2014
@shelhamer shelhamer deleted the next branch February 26, 2014 20:40
@shelhamer shelhamer restored the next branch February 26, 2014 20:41
@shelhamer shelhamer reopened this Feb 26, 2014
jeffdonahue and others added 21 commits February 26, 2014 14:41
@jeffdonahue @shelhamer
add split layer insertion tests; move split insertion code to util file
9a8c7ab
@jeffdonahue @shelhamer
some cleanup
9662a3f
@jeffdonahue @shelhamer
eliminate redundant code with get_split_blob_name method
0faf0f9
@jeffdonahue @shelhamer
change \n's to less distracting spaces in hard-coded proto strings
89507f1
@jeffdonahue @shelhamer
give first top split blob same name as bottom blob
58aa9ac
@jeffdonahue @shelhamer
allow in place computation of SplitLayer 0th top blob
74a8366
@jeffdonahue @shelhamer
change \" in test_split_layer to ' for readability
b9cd3dd
@jeffdonahue @shelhamer
remove pointlessly duplicated CheckGradientExhaustive calls (I screwed
9fc1e93 
up when merging, I think)
@jeffdonahue @shelhamer
fix comment typo
0e97848
@jeffdonahue @shelhamer
add test for layer with two tops that are inputs to multiple layers
fc48fbc
@jeffdonahue @shelhamer
remove redundant add_bottom (immediately cleared and then re-added)
90c581d
@jeffdonahue @shelhamer
get_split_blob_name returns a string to remove some verbosity
00aca7a
@jeffdonahue @shelhamer
get rid of messy snprintf string concatenation
2822a81
@jeffdonahue @shelhamer
eliminate some cruft by relying on std::map default initializations
685a0fd
@jeffdonahue @shelhamer
remove unnecessary include
e1d0c97
@jeffdonahue @shelhamer
fix split layer insertion bug with in-place layers
c933a16
@jeffdonahue @shelhamer
add imagenet no split insertion test
b79667d
@jeffdonahue @shelhamer
add idempotence test
0436e69
@jeffdonahue @shelhamer
minor cleanup; only get blob_name if needed
4cc0faa
@shelhamer
Merge pull request #129 from jeffdonahue/dags-by-split
a8c7407 
Welcome to the model of forking paths.
@shelhamer
Define split layer (merge trick)
527cfab 
Originally authored by Jeff Donahue, but this commit was needed for
historical reasons.
@sergeyk
Copy link
Contributor

sergeyk commented Feb 26, 2014

shelhamer added a commit that referenced this pull request Feb 26, 2014
@shelhamer
Merge pull request #167 from BVLC/next
9da7bcb 
So be it.
@shelhamer shelhamer merged commit 9da7bcb into master Feb 26, 2014
@shelhamer shelhamer deleted the next branch February 27, 2014 01:22
@shelhamer
Copy link
Member Author

At the Mountains of Merging Madness.

First, you must unravel the fibers of your mind. Then rebase.

@Yangqing
Copy link
Member

Good pic :)

On Thursday, February 27, 2014, Evan Shelhamer [email protected]
wrote:

At the Mountains of Merging Madness.

[image: First, you must unravel the fibers of your mind. Then rebase.]https://github-camo.global.ssl.fastly.net/dfe8bd9a161797ebe1bb79c6b52fd0c00e406f12/687474703a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f656e2f662f66632f4c6f766563726166742532435f4d6f756e7461696e735f6f665f4d61646e6573732e6a7067

Reply to this email directly or view it on GitHubhttps://github.com//pull/167#issuecomment-36220146
.

Sent from Gmail Mobile - apologeez for any typoz.

@shelhamer shelhamer changed the title Bring parts of dev @ 25.02.14 into master Next: dev @ 25.02.14 into master May 22, 2014
@shelhamer shelhamer mentioned this pull request Jul 28, 2014
Merged
mitmul pushed a commit to mitmul/caffe that referenced this pull request Sep 30, 2014
@shelhamer
Merge pull request BVLC#167 from BVLC/next
dc60b30 
So be it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@shelhamer @jeffdonahue @sergeyk @Yangqing @sguada @t-abe