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

upgrading matlab interface by adding new methods to matlab class Net #4996

Closed
wants to merge 17 commits into from
Closed

upgrading matlab interface by adding new methods to matlab class Net #4996

wants to merge 17 commits into from

Conversation

yossibiton
Copy link

I took the updated matlab interface from ShaoqingRen/caffe, which adds many new methods compared to the current interface master branch.
These changes were originally done to support faster_rcnn project but can be added to caffe master branch as independent update.

After accepting this PR, and merging #4163 , the projects faster_rcnn and py-faster-rcnn can be used alongside caffe master branch without having to use different caffe versions.

cypof and others added 17 commits September 9, 2016 12:57
Currently parse_log.py skips all non timestamped lines
only once. When resuming a solver and appending to the
same log file, it creates more non timestamped log lines.
This change allows the script to silently skip those lines.
sig-ce learns to ignore by zeroing out the loss/diff at targets equal to
the configured `ignore_label`.

n.b. as of now the loss/diff are not properly normalized when there are
ignored targets. sig-ce loss should adopt the same normalization options
as softmax loss.
sig-ce loss handles all the same normalizations as the softmax loss;
refer to #3296 for more detail.

this preserves the default normalization for sig-ce loss: batch size.
Sigmoid Cross-Entropy Loss: ignore selected targets by `ignore_label`
Avoids missing return values during build
the solver checks its proto type (SolverParameter.type) on
instantiation:

- if the proto type is unspecified it's set according to the class type
  `Solver::type()`
- if the proto type and class type conflict, the solver dies loudly

this helps avoid accidental instantiation of a different solver type
than intended when the solver def and class differ. guaranteed type
information in the SolverParameter will simplify multi-solver
coordination too.
OS X: build with latest SDK by default
Add missing spaces besides equal signs in batch_norm_layer.cpp
Solver: check and set type to reconcile class and proto type
@yossibiton
Copy link
Author

sorry for the mess, i have opened a new pull request with clean commit :
#5020

@yossibiton yossibiton closed this Nov 23, 2016
@yossibiton
Copy link
Author

@wadefelix
I didn't have any problems in matcaffe when specifying the solver type in the prototxt files.

Anyway, this PR is depcrecated as i replaced it with this one :
#5020

@yossibiton yossibiton reopened this Nov 30, 2016
@yossibiton yossibiton closed this Nov 30, 2016
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.

8 participants