diff --git a/paddle/api/Trainer.cpp b/paddle/api/Trainer.cpp index 8a4b79a511dbeae33ad9cae38eee8dee2e9abc2e..84e4ca054abb0100a02c8a40e31c49c17684ef40 100644 --- a/paddle/api/Trainer.cpp +++ b/paddle/api/Trainer.cpp @@ -73,6 +73,7 @@ Trainer* Trainer::create(TrainerConfig* config, if (retv->m->getConfig().IsInitialized()) { return retv; } else { + retv->m->getConfig().CheckInitialized(); throw IOError(); } } diff --git a/python/paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp b/python/paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp index ec19e74cf95b213c0d8774cc37f44bedbfffdb7a..fc53422afd44a6cb1d81a8ec9d27d83523f30e6c 100644 --- a/python/paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp +++ b/python/paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp @@ -12,21 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ +#include #include #include #include #include "TrainerConfig.pb.h" -using google::protobuf::MessageLite; -using google::protobuf::Message; - -bool loadPb(MessageLite* conf, const std::string& filename) { +bool loadPb(google::protobuf::Message* conf, const std::string& filename) { std::ifstream fin; fin.open(filename.c_str()); if (fin.is_open()) { std::string str((std::istreambuf_iterator(fin)), std::istreambuf_iterator()); - bool ok = conf->ParseFromString(str); + bool ok = google::protobuf::TextFormat::ParseFromString(str, conf); fin.close(); return ok; } else { @@ -35,8 +33,8 @@ bool loadPb(MessageLite* conf, const std::string& filename) { } int main(int argc, char** argv) { - std::unique_ptr config1; - std::unique_ptr config2; + std::unique_ptr config1; + std::unique_ptr config2; if (argc == 3) { config1.reset(new paddle::ModelConfig()); config2.reset(new paddle::ModelConfig()); @@ -52,8 +50,7 @@ int main(int argc, char** argv) { return 3; } else { if (google::protobuf::util::MessageDifferencer::ApproximatelyEquals( - *reinterpret_cast(config1.get()), - *reinterpret_cast(config2.get()))) { + *config1, *config2)) { return 0; } else { return 4;