Skip to content

Add unary CaffeNet constructor for uninitialized nets #365

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

Merged
shelhamer merged 1 commit into from
Apr 25, 2014
Merged

Add unary CaffeNet constructor for uninitialized nets #365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions python/caffe/_caffe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,28 @@ class CaffeLayer {

// A simple wrapper over CaffeNet that runs the forward process.
struct CaffeNet {
// For cases where parameters will be determined later by the Python user,
// create a Net with unallocated parameters (which will not be zero-filled
// when accessed).
explicit CaffeNet(string param_file) {
Init(param_file);
}

CaffeNet(string param_file, string pretrained_param_file) {
CheckFile(param_file);
Init(param_file);
CheckFile(pretrained_param_file);

net_.reset(new Net<float>(param_file));
net_->CopyTrainedLayersFrom(pretrained_param_file);
}

explicit CaffeNet(shared_ptr<Net<float> > net)
: net_(net) {}

void Init(string param_file) {
CheckFile(param_file);
net_.reset(new Net<float>(param_file));
}


virtual ~CaffeNet() {}

inline void check_array_against_blob(
Expand Down Expand Up @@ -308,6 +319,7 @@ class CaffeSGDSolver {
BOOST_PYTHON_MODULE(_caffe) {
boost::python::class_<CaffeNet>(
"Net", boost::python::init<string, string>())
.def(boost::python::init<string>())
.def("Forward", &CaffeNet::Forward)
.def("ForwardPrefilled", &CaffeNet::ForwardPrefilled)
.def("Backward", &CaffeNet::Backward)
Expand Down