Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

fix bug: pycaffe net.params can't get param name info #308

Closed
wants to merge 1 commit into from
Closed

fix bug: pycaffe net.params can't get param name info #308

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/caffe/net.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ class Net {
* another Net.
*/
void CopyTrainedLayersFrom(const NetParameter& param);
void CopyTrainedLayersFrom(const string trained_filename);
void CopyTrainedLayersFromBinaryProto(const string trained_filename);
void CopyTrainedLayersFromHDF5(const string trained_filename);
void CopyTrainedLayersFrom(const string& trained_filename);
void CopyTrainedLayersFromBinaryProto(const string& trained_filename);
void CopyTrainedLayersFromHDF5(const string& trained_filename);
/// @brief Writes the net to a proto.
void ToProto(NetParameter* param, bool write_diff = false) const;
/// @brief Writes the net to an HDF5 file.
Expand Down
2 changes: 1 addition & 1 deletion python/caffe/_caffe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ BOOST_PYTHON_MODULE(_caffe) {
.def("clear_param_diffs", static_cast<void (Net<Dtype>::*)(void)>(
&Net<Dtype>::ClearParamDiffs))
// The cast is to select a particular overload.
.def("copy_from", static_cast<void (Net<Dtype>::*)(const string)>(
.def("copy_from", static_cast<void (Net<Dtype>::*)(const string&)>(
&Net<Dtype>::CopyTrainedLayersFrom))
.def("share_with", &Net<Dtype>::ShareTrainedLayersWith)
.add_property("_blob_loss_weights", bp::make_function(
Expand Down
6 changes: 3 additions & 3 deletions src/caffe/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ void Net<Dtype>::CopyTrainedLayersFrom(const NetParameter& param_inp) {
}

template <typename Dtype>
void Net<Dtype>::CopyTrainedLayersFrom(const string trained_filename) {
void Net<Dtype>::CopyTrainedLayersFrom(const string& trained_filename) {
if (trained_filename.size() >= 3 &&
trained_filename.compare(trained_filename.size() - 3, 3, ".h5") == 0) {
CopyTrainedLayersFromHDF5(trained_filename);
Expand All @@ -1459,14 +1459,14 @@ void Net<Dtype>::CopyTrainedLayersFrom(const string trained_filename) {

template <typename Dtype>
void Net<Dtype>::CopyTrainedLayersFromBinaryProto(
const string trained_filename) {
const string& trained_filename) {
NetParameter param;
ReadNetParamsFromBinaryFileOrDie(trained_filename, &param);
CopyTrainedLayersFrom(param);
}

template <typename Dtype>
void Net<Dtype>::CopyTrainedLayersFromHDF5(const string trained_filename) {
void Net<Dtype>::CopyTrainedLayersFromHDF5(const string& trained_filename) {
hid_t file_hid = H5Fopen(trained_filename.c_str(), H5F_ACC_RDONLY,
H5P_DEFAULT);
CHECK_GE(file_hid, 0) << "Couldn't open " << trained_filename;
Expand Down