Skip to content

BlobMathTest: fix precision issues #1874

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
merged 1 commit into from
Feb 16, 2015
Merged

BlobMathTest: fix precision issues #1874

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
53 changes: 34 additions & 19 deletions src/caffe/test/test_blob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,12 @@ class BlobMathTest : public MultiDeviceTest<TypeParam> {
typedef typename TypeParam::Dtype Dtype;
protected:
BlobMathTest()
: blob_(new Blob<Dtype>(2, 3, 4, 5)) {}
: blob_(new Blob<Dtype>(2, 3, 4, 5)),
epsilon_(1e-6) {}

virtual ~BlobMathTest() { delete blob_; }
Blob<Dtype>* const blob_;
Dtype epsilon_;
};

TYPED_TEST_CASE(BlobMathTest, TestDtypesAndDevices);
Expand Down Expand Up @@ -95,7 +98,8 @@ TYPED_TEST(BlobMathTest, TestSumOfSquares) {
default:
LOG(FATAL) << "Unknown device: " << TypeParam::device;
}
EXPECT_FLOAT_EQ(expected_sumsq, this->blob_->sumsq_data());
EXPECT_NEAR(expected_sumsq, this->blob_->sumsq_data(),
this->epsilon_ * expected_sumsq);
EXPECT_EQ(0, this->blob_->sumsq_diff());

// Check sumsq_diff too.
Expand All @@ -112,9 +116,12 @@ TYPED_TEST(BlobMathTest, TestSumOfSquares) {
default:
LOG(FATAL) << "Unknown device: " << TypeParam::device;
}
EXPECT_FLOAT_EQ(expected_sumsq, this->blob_->sumsq_data());
EXPECT_FLOAT_EQ(expected_sumsq * kDiffScaleFactor * kDiffScaleFactor,
this->blob_->sumsq_diff());
EXPECT_NEAR(expected_sumsq, this->blob_->sumsq_data(),
this->epsilon_ * expected_sumsq);
const Dtype expected_sumsq_diff =
expected_sumsq * kDiffScaleFactor * kDiffScaleFactor;
EXPECT_NEAR(expected_sumsq_diff, this->blob_->sumsq_diff(),
this->epsilon_ * expected_sumsq_diff);
}

TYPED_TEST(BlobMathTest, TestAsum) {
Expand Down Expand Up @@ -146,7 +153,8 @@ TYPED_TEST(BlobMathTest, TestAsum) {
default:
LOG(FATAL) << "Unknown device: " << TypeParam::device;
}
EXPECT_FLOAT_EQ(expected_asum, this->blob_->asum_data());
EXPECT_NEAR(expected_asum, this->blob_->asum_data(),
this->epsilon_ * expected_asum);
EXPECT_EQ(0, this->blob_->asum_diff());

// Check asum_diff too.
Expand All @@ -163,8 +171,11 @@ TYPED_TEST(BlobMathTest, TestAsum) {
default:
LOG(FATAL) << "Unknown device: " << TypeParam::device;
}
EXPECT_FLOAT_EQ(expected_asum, this->blob_->asum_data());
EXPECT_FLOAT_EQ(expected_asum * kDiffScaleFactor, this->blob_->asum_diff());
EXPECT_NEAR(expected_asum, this->blob_->asum_data(),
this->epsilon_ * expected_asum);
const Dtype expected_diff_asum = expected_asum * kDiffScaleFactor;
EXPECT_NEAR(expected_diff_asum, this->blob_->asum_diff(),
this->epsilon_ * expected_diff_asum);
}

TYPED_TEST(BlobMathTest, TestScaleData) {
Expand Down Expand Up @@ -193,20 +204,22 @@ TYPED_TEST(BlobMathTest, TestScaleData) {
}
const Dtype kDataScaleFactor = 3;
this->blob_->scale_data(kDataScaleFactor);
EXPECT_FLOAT_EQ(asum_before_scale * kDataScaleFactor,
this->blob_->asum_data());
EXPECT_NEAR(asum_before_scale * kDataScaleFactor, this->blob_->asum_data(),
this->epsilon_ * asum_before_scale * kDataScaleFactor);
EXPECT_EQ(0, this->blob_->asum_diff());

// Check scale_diff too.
const Dtype kDataToDiffScaleFactor = 7;
const Dtype* data = this->blob_->cpu_data();
caffe_cpu_scale(this->blob_->count(), kDataToDiffScaleFactor, data,
this->blob_->mutable_cpu_diff());
EXPECT_FLOAT_EQ(asum_before_scale * kDataScaleFactor,
this->blob_->asum_data());
const Dtype diff_asum_before_scale = this->blob_->asum_diff();
EXPECT_FLOAT_EQ(asum_before_scale * kDataScaleFactor * kDataToDiffScaleFactor,
diff_asum_before_scale);
const Dtype expected_asum_before_scale = asum_before_scale * kDataScaleFactor;
EXPECT_NEAR(expected_asum_before_scale, this->blob_->asum_data(),
this->epsilon_ * expected_asum_before_scale);
const Dtype expected_diff_asum_before_scale =
asum_before_scale * kDataScaleFactor * kDataToDiffScaleFactor;
EXPECT_NEAR(expected_diff_asum_before_scale, this->blob_->asum_diff(),
this->epsilon_ * expected_diff_asum_before_scale);
switch (TypeParam::device) {
case Caffe::CPU:
this->blob_->mutable_cpu_diff();
Expand All @@ -219,10 +232,12 @@ TYPED_TEST(BlobMathTest, TestScaleData) {
}
const Dtype kDiffScaleFactor = 3;
this->blob_->scale_diff(kDiffScaleFactor);
EXPECT_FLOAT_EQ(asum_before_scale * kDataScaleFactor,
this->blob_->asum_data());
EXPECT_FLOAT_EQ(diff_asum_before_scale * kDiffScaleFactor,
this->blob_->asum_diff());
EXPECT_NEAR(asum_before_scale * kDataScaleFactor, this->blob_->asum_data(),
this->epsilon_ * asum_before_scale * kDataScaleFactor);
const Dtype expected_diff_asum =
expected_diff_asum_before_scale * kDiffScaleFactor;
EXPECT_NEAR(expected_diff_asum, this->blob_->asum_diff(),
this->epsilon_ * expected_diff_asum);
}

} // namespace caffe