From dbb12d6fde6997b3039aa284f1bff675f585ea10 Mon Sep 17 00:00:00 2001 From: Shree Devi Kumar Date: Thu, 24 Jan 2019 15:39:37 +0000 Subject: [PATCH] more updates to lstm related unittests --- unittest/lstm_recode_test.cc | 2 ++ unittest/lstm_squashed_test.cc | 2 +- unittest/lstm_test.cc | 18 +++++++++--------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/unittest/lstm_recode_test.cc b/unittest/lstm_recode_test.cc index 3104cf98c8..7de694b6a2 100644 --- a/unittest/lstm_recode_test.cc +++ b/unittest/lstm_recode_test.cc @@ -23,6 +23,7 @@ TEST_F(LSTMTrainerTest, RecodeTestKorBase) { double kor_full_err = TrainIterations(kTrainerIterations * 2); EXPECT_LT(kor_full_err, 88); // EXPECT_GT(kor_full_err, 85); + LOG(INFO) << "********** Expected < 88 ************\n" ; } TEST_F(LSTMTrainerTest, RecodeTestKor) { @@ -31,6 +32,7 @@ TEST_F(LSTMTrainerTest, RecodeTestKor) { "kor.Arial_Unicode_MS.exp0.lstmf", true, true, 5e-4, false); double kor_recode_err = TrainIterations(kTrainerIterations); EXPECT_LT(kor_recode_err, 60); + LOG(INFO) << "********** Expected < 60 ************\n" ; } // Tests that the given string encodes and decodes back to the same diff --git a/unittest/lstm_squashed_test.cc b/unittest/lstm_squashed_test.cc index 2103a0591c..966deefdef 100644 --- a/unittest/lstm_squashed_test.cc +++ b/unittest/lstm_squashed_test.cc @@ -24,7 +24,7 @@ TEST_F(LSTMTrainerTest, TestSquashed) { "SQU-2-layer-lstm", /*recode*/ true, /*adam*/ true); double lstm_2d_err = TrainIterations(kTrainerIterations * 2); EXPECT_LT(lstm_2d_err, 80); - LOG(INFO) << "********** < 80 ************" ; + LOG(INFO) << "********** < 80 ************\n" ; TestIntMode(kTrainerIterations); } diff --git a/unittest/lstm_test.cc b/unittest/lstm_test.cc index af56b90204..0dc1d319ab 100644 --- a/unittest/lstm_test.cc +++ b/unittest/lstm_test.cc @@ -33,7 +33,7 @@ TEST_F(LSTMTrainerTest, BasicTest) { "Ct1,1,64O1c1]", "no-lstm", "eng/eng.unicharset", "eng.Arial.exp0.lstmf", false, false, 2e-4, false); - double non_lstm_err = TrainIterations(kTrainerIterations * 3); + double non_lstm_err = TrainIterations(kTrainerIterations * 4); EXPECT_LT(non_lstm_err, 98); LOG(INFO) << "********** Expected < 98 ************\n" ; @@ -55,7 +55,7 @@ TEST_F(LSTMTrainerTest, ColorTest) { double lstm_uni_err = TrainIterations(kTrainerIterations); EXPECT_LT(lstm_uni_err, 85); // EXPECT_GT(lstm_uni_err, 66); - LOG(INFO) << "********** Expected > 66 ** < 85 ************\n" ; + LOG(INFO) << "********** Expected < 85 ************\n" ; } TEST_F(LSTMTrainerTest, BidiTest) { @@ -75,10 +75,10 @@ TEST_F(LSTMTrainerTest, Test2D) { // A 2-layer LSTM with a 2-D feature-extracting LSTM on the bottom. SetupTrainerEng("[1,32,0,1 S4,2 L2xy16 Ct1,1,16 S8,1 Lbx100 O1c1]", "2-D-2-layer-lstm", false, false); - double lstm_2d_err = TrainIterations(kTrainerIterations); + double lstm_2d_err = TrainIterations(kTrainerIterations * 3 / 2 ); EXPECT_LT(lstm_2d_err, 98); - EXPECT_GT(lstm_2d_err, 90); - LOG(INFO) << "********** Expected > 90 ** < 98 ************\n" ; +// EXPECT_GT(lstm_2d_err, 90); + LOG(INFO) << "********** Expected < 98 ************\n" ; // Int mode training is dead, so convert the trained network to int and check // that its error rate is close to the float version. TestIntMode(kTrainerIterations); @@ -111,7 +111,7 @@ TEST_F(LSTMTrainerTest, SpeedTest) { TEST_F(LSTMTrainerTest, DeterminismTest) { SetupTrainerEng("[1,32,0,1 S4,2 L2xy16 Ct1,1,16 S8,1 Lbx100 O1c1]", "2-D-2-layer-lstm", false, false); - double lstm_2d_err_a = TrainIterations(kTrainerIterations / 3); + double lstm_2d_err_a = TrainIterations(kTrainerIterations); double act_error_a = trainer_->ActivationError(); double char_error_a = trainer_->CharError(); GenericVector trainer_a_data; @@ -119,7 +119,7 @@ TEST_F(LSTMTrainerTest, DeterminismTest) { &trainer_a_data)); SetupTrainerEng("[1,32,0,1 S4,2 L2xy16 Ct1,1,16 S8,1 Lbx100 O1c1]", "2-D-2-layer-lstm", false, false); - double lstm_2d_err_b = TrainIterations(kTrainerIterations / 3); + double lstm_2d_err_b = TrainIterations(kTrainerIterations); double act_error_b = trainer_->ActivationError(); double char_error_b = trainer_->CharError(); EXPECT_FLOAT_EQ(lstm_2d_err_a, lstm_2d_err_b); @@ -148,8 +148,8 @@ TEST_F(LSTMTrainerTest, SoftmaxBaselineTest) { SetupTrainerEng("[1,1,0,32 Lfx96 O1c1]", "1D-lstm", false, true); double lstm_uni_err = TrainIterations(kTrainerIterations * 2); EXPECT_LT(lstm_uni_err, 60); - EXPECT_GT(lstm_uni_err, 48); - LOG(INFO) << "********** Expected > 48 ** < 60 ************\n" ; +// EXPECT_GT(lstm_uni_err, 48); + LOG(INFO) << "********** Expected < 60 ************\n" ; // Check that it works in int mode too. TestIntMode(kTrainerIterations); // If we run TestIntMode again, it tests that int_mode networks can