Skip to content

Comments

fix for layer-type-str: loss_param in V1LayerParameter#1836

Merged
jeffdonahue merged 1 commit intoBVLC:devfrom
jeffdonahue:loss-param-upgrade-fix
Feb 6, 2015
Merged

fix for layer-type-str: loss_param in V1LayerParameter#1836
jeffdonahue merged 1 commit intoBVLC:devfrom
jeffdonahue:loss-param-upgrade-fix

Conversation

@jeffdonahue
Copy link
Contributor

Fixes upgrade bug I introduced in #1694: I forgot to add loss_param to V1LayerParameter after it was added by @longjon and I rebased on his work. Will merge this once Travis passes (and I go check caffe.proto again to make sure nothing else is missing..)

@jeffdonahue jeffdonahue changed the title fix for layer-type-str: loss_param should have been included in fix for layer-type-str: loss_param in V1LayerParameter Feb 6, 2015
been included in V1LayerParameter, get upgraded
@jeffdonahue jeffdonahue force-pushed the loss-param-upgrade-fix branch from cd857ae to 6a22697 Compare February 6, 2015 03:53
@jeffdonahue
Copy link
Contributor Author

Oops, I'd forgotten deconvolution layer as well -- now fixed too. Sorry for temporarily breaking all of your recent improvements @longjon... I think the V1LayerParameter now matches exactly what LayerParameter was before #1694.

@jeffdonahue
Copy link
Contributor Author

Hmmm... Travis is failing due to (hopefully temporary) issues downloading Ubuntu updates from PPA:

Failed to fetch http://ppa.launchpad.net/tuleu/precise-backports/ubuntu/pool/main/g/gflags/libgflags2_2.0-1.1ubuntu1~precise1_amd64.deb  Unable to connect to ppa.launchpad.net:http:
Failed to fetch http://ppa.launchpad.net/tuleu/precise-backports/ubuntu/pool/main/g/google-glog/libgoogle-glog0_0.3.3-1~precise1_amd64.deb  Unable to connect to ppa.launchpad.net:http:
Failed to fetch http://ppa.launchpad.net/tuleu/precise-backports/ubuntu/pool/main/g/gflags/libgflags-dev_2.0-1.1ubuntu1~precise1_amd64.deb  Unable to connect to ppa.launchpad.net:http:
Failed to fetch http://ppa.launchpad.net/tuleu/precise-backports/ubuntu/pool/main/g/google-glog/libgoogle-glog-dev_0.3.3-1~precise1_amd64.deb  Unable to connect to ppa.launchpad.net:http:
E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?
The command "sudo -E $SCRIPTS/travis_install.sh" failed and exited with 100 during .

I've built this and done make runtest, so I'll merge without Travis's blessing since this is a bugfix (and the bug breaks things that worked prior to #1694).

jeffdonahue added a commit that referenced this pull request Feb 6, 2015
fix for layer-type-str: loss_param in V1LayerParameter
@jeffdonahue jeffdonahue merged commit 336ef5a into BVLC:dev Feb 6, 2015
@jeffdonahue jeffdonahue deleted the loss-param-upgrade-fix branch February 6, 2015 04:54
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.

1 participant