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.

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

Next: 0.99 #231

Merged
merged 141 commits into from
Mar 19, 2014
Merged

Next: 0.99 #231

merged 141 commits into from
Mar 19, 2014

Conversation

shelhamer
Copy link
Member

mavenlin and others added 30 commits February 26, 2014 15:41
remove test code (no longer needed and won't compile)
im2col and col2im learn to pad and padding layer is obsolete
note that pairs of params with the same layer name are the
params & bias
HDF5DataLayer: read matrix of features and labels from HDF5 file as input
(also change EXPECT_LT and EXPECT_GT pair to EXPECT_NEAR)
shelhamer and others added 13 commits March 18, 2014 13:55
Move the Caffe reference imagenet model and script to fetch it to
examples/imagenet.

Caffe bundles reference models, but it makes more sense to keep them
close to examples.
Fix minor issues related to CUDA_KERNEL_LOOP -- merging myself as I'm only adding/removing comments other than the addition of CUDA_KERNEL_LOOP to PaddingLayer (and checked that this passes all tests).
Add libcaffe.a to dependencies for TEST_ALL_BIN
@sergeyk
Copy link
Contributor

sergeyk commented Mar 19, 2014

doooo it

@shelhamer
Copy link
Member Author

SOON

I want to! @sguada said he's in the middle of making changes.

@longjon
Copy link
Contributor

longjon commented Mar 19, 2014

@sergeyk where's examples/images/lena.png? Is that downloaded somewhere or just missing? (filter_visualization.ipynb is broken without it).

@shelhamer
Copy link
Member Author

It was removed in @sergeyk's 34e04cf. I've brought it back and put it in examples/images with cat.jpg too.

@sergeyk
Copy link
Contributor

sergeyk commented Mar 19, 2014

Ah yes, thanks for noticing. Please put it in examples/images/ when you
bring it back, as other example notebooks rely on it as well.

The problem seems to be that .gitignore ignores everything in examples/. I
guess that's desired behavior, but it will cause more mistakes like this.

Maybe we should only ignore examples/_*, and make sure that all
downloaded/output models start with an underscore.

On Tue, Mar 18, 2014 at 11:47 PM, Evan Shelhamer
notifications@github.comwrote:

It was removed in @sergeyk https://github.com/sergeyk's 34e04cfhttps://github.com/BVLC/caffe/commit/34e04cf7a9904f2680818dab9c0818b9b63c8016.
I'll bring it back now then I'm merging.


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

@shelhamer
Copy link
Member Author

Yeah, I brought it back (along with the entire imagenet_pretrained.ipynb actually!).

Right now we're ignoring examples so you need to do git add --force to convince it to accept changes. I think if we change it we'll have just as many errors of accidentally versioning changes we didn't mean too.

The current way you can experiment with the notebooks, scripts, and the like and not worry about accidentally committing them.

@shelhamer
Copy link
Member Author

p.s. après tests, le merge.

shelhamer added a commit that referenced this pull request Mar 19, 2014
@shelhamer shelhamer merged commit ade96f1 into master Mar 19, 2014
@shelhamer
Copy link
Member Author

The calm after the merge

@shelhamer shelhamer deleted the next branch March 19, 2014 07:12
shelhamer added a commit that referenced this pull request Mar 19, 2014
@shelhamer
Copy link
Member Author

Release workflow note: future releases will be developed as PRs, as this one was, but the actual integration will be done with a manual fast-forward merge.

This preserves the lineage of dev from master without the merge commit that makes the histories diverge.

@sergeyk
Copy link
Contributor

sergeyk commented Mar 19, 2014

You should add this to the relevant docs/ page.

On Wed, Mar 19, 2014 at 12:45 PM, Evan Shelhamer
notifications@github.comwrote:

Release workflow note: future releases will be developed as PRs, as this
one was, but the actual integration will be done with a manual fast-forward
merge.

This preserves the lineage of dev from master without the merge commit
that makes the histories diverge.


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

mitmul pushed a commit to mitmul/caffe that referenced this pull request Sep 30, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.