Move IntSimdMatrixNative from IntSimdMatrix to unittest

It is only used for the unit test. Signed-off-by: Stefan Weil <sw@weilnetz.de>
tesseract-ocr · Jan 14, 2019 · a9a1035 · a9a1035
1 parent d36231e
commit a9a1035
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/arch/intsimdmatrix.cpp b/src/arch/intsimdmatrix.cpp
@@ -24,8 +24,6 @@
 namespace tesseract {
 
 const IntSimdMatrix* IntSimdMatrix::intSimdMatrix = nullptr;
-const IntSimdMatrix IntSimdMatrix::IntSimdMatrixNative =
-  IntSimdMatrix(1, 1, 1, 1, 1, {});
 
 // Computes a reshaped copy of the weight matrix w. If there are no
 // partial_funcs_, it does nothing.

diff --git a/src/arch/intsimdmatrix.h b/src/arch/intsimdmatrix.h
@@ -114,7 +114,6 @@ class IntSimdMatrix {
   static const IntSimdMatrix* intSimdMatrix;
   static const IntSimdMatrix IntSimdMatrixAVX2;
   static const IntSimdMatrix IntSimdMatrixSSE;
-  static const IntSimdMatrix IntSimdMatrixNative;
 
  protected:
   // Rounds the input up to a multiple of the given factor.

diff --git a/unittest/intsimdmatrix_test.cc b/unittest/intsimdmatrix_test.cc
@@ -25,6 +25,8 @@
 namespace tesseract {
 namespace {
 
+static const IntSimdMatrix IntSimdMatrixNative = IntSimdMatrix(1, 1, 1, 1, 1, {});
+
 class IntSimdMatrixTest : public ::testing::Test {
  protected:
   // Makes a random weights matrix of the given size.
@@ -64,7 +66,7 @@ class IntSimdMatrixTest : public ::testing::Test {
         GenericVector<double> scales = RandomScales(num_out);
         std::vector<double> base_result(num_out);
         std::vector<int8_t> dummy;
-        IntSimdMatrix::IntSimdMatrixNative.MatrixDotVector(w, dummy, scales, u.data(), base_result.data());
+        IntSimdMatrixNative.MatrixDotVector(w, dummy, scales, u.data(), base_result.data());
         std::vector<double> test_result(num_out);
         std::vector<int8_t> shaped_wi;
         matrix.Init(w, shaped_wi);