Skip to content

Commit 3ff5118

Browse files
authored
Merge Fix the residual norm test baseline
This PR fixes the baseline in the residual_norm test to fit original expectation. Related PR: #850
2 parents 286a163 + d50d517 commit 3ff5118

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

reference/test/stop/residual_norm_kernels.cpp

+8-6
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,15 @@ TYPED_TEST(ResidualNorm, WaitsTillResidualGoal)
162162
.residual_norm(res_norm.get())
163163
.check(RelativeStoppingId, true, &stop_status, &one_changed));
164164

165-
res_norm->at(0) = r<TypeParam>::value * 1.1 * res_norm->at(0);
165+
res_norm->at(0) = r<TypeParam>::value * 1.1 * rhs_norm->at(0);
166166
ASSERT_FALSE(
167167
rhs_criterion->update()
168168
.residual_norm(res_norm.get())
169169
.check(RelativeStoppingId, true, &stop_status, &one_changed));
170170
ASSERT_EQ(stop_status.get_data()[0].has_converged(), false);
171171
ASSERT_EQ(one_changed, false);
172172

173-
res_norm->at(0) = r<TypeParam>::value * 0.9 * res_norm->at(0);
173+
res_norm->at(0) = r<TypeParam>::value * 0.9 * rhs_norm->at(0);
174174
ASSERT_TRUE(
175175
rhs_criterion->update()
176176
.residual_norm(res_norm.get())
@@ -180,6 +180,7 @@ TYPED_TEST(ResidualNorm, WaitsTillResidualGoal)
180180
}
181181
{
182182
auto res_norm = gko::initialize<NormVector>({100.0}, this->exec_);
183+
auto init_res_val = res_norm->at(0, 0);
183184
constexpr gko::uint8 RelativeStoppingId{1};
184185
bool one_changed{};
185186
gko::Array<gko::stopping_status> stop_status(this->exec_, 1);
@@ -190,15 +191,15 @@ TYPED_TEST(ResidualNorm, WaitsTillResidualGoal)
190191
.residual_norm(res_norm.get())
191192
.check(RelativeStoppingId, true, &stop_status, &one_changed));
192193

193-
res_norm->at(0) = r<TypeParam>::value * 1.1 * res_norm->at(0);
194+
res_norm->at(0) = r<TypeParam>::value * 1.1 * init_res_val;
194195
ASSERT_FALSE(
195196
rel_criterion->update()
196197
.residual_norm(res_norm.get())
197198
.check(RelativeStoppingId, true, &stop_status, &one_changed));
198199
ASSERT_EQ(stop_status.get_data()[0].has_converged(), false);
199200
ASSERT_EQ(one_changed, false);
200201

201-
res_norm->at(0) = r<TypeParam>::value * 0.9 * res_norm->at(0);
202+
res_norm->at(0) = r<TypeParam>::value * 0.9 * init_res_val;
202203
ASSERT_TRUE(
203204
rel_criterion->update()
204205
.residual_norm(res_norm.get())
@@ -590,6 +591,7 @@ TYPED_TEST(ResidualNormReduction, WaitsTillResidualGoal)
590591
auto initial_res = gko::initialize<Mtx>({100.0}, this->exec_);
591592
std::shared_ptr<gko::LinOp> rhs = gko::initialize<Mtx>({10.0}, this->exec_);
592593
auto res_norm = gko::initialize<NormVector>({100.0}, this->exec_);
594+
auto init_res_val = res_norm->at(0, 0);
593595
auto criterion =
594596
this->factory_->generate(nullptr, rhs, nullptr, initial_res.get());
595597
bool one_changed{};
@@ -602,15 +604,15 @@ TYPED_TEST(ResidualNormReduction, WaitsTillResidualGoal)
602604
.residual_norm(res_norm.get())
603605
.check(RelativeStoppingId, true, &stop_status, &one_changed));
604606

605-
res_norm->at(0) = r<TypeParam>::value * 1.1 * res_norm->at(0);
607+
res_norm->at(0) = r<TypeParam>::value * 1.1 * init_res_val;
606608
ASSERT_FALSE(
607609
criterion->update()
608610
.residual_norm(res_norm.get())
609611
.check(RelativeStoppingId, true, &stop_status, &one_changed));
610612
ASSERT_EQ(stop_status.get_data()[0].has_converged(), false);
611613
ASSERT_EQ(one_changed, false);
612614

613-
res_norm->at(0) = r<TypeParam>::value * 0.9 * res_norm->at(0);
615+
res_norm->at(0) = r<TypeParam>::value * 0.9 * init_res_val;
614616
ASSERT_TRUE(
615617
criterion->update()
616618
.residual_norm(res_norm.get())

0 commit comments

Comments
 (0)