@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
12
See the License for the specific language governing permissions and
13
13
limitations under the License.
14
14
==============================================================================*/
15
- #if defined(INTEL_MKL) && defined(ENABLE_MKL)
15
+ #if defined(INTEL_MKL)
16
16
#define EIGEN_USE_THREADS
17
17
18
18
#include < functional>
@@ -64,10 +64,10 @@ TEST_F(QuantizedMatMulTest, Small_withBias) {
64
64
AddInputFromArray<qint8>(TensorShape ({3 , 4 }),
65
65
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
66
66
AddInputFromArray<qint32>(TensorShape ({4 }), {1 , 2 , 3 , 4 });
67
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
68
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
69
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
70
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
67
+ AddInputFromArray<float >(TensorShape ({}), {0 });
68
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
69
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
70
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
71
71
72
72
TF_ASSERT_OK (RunOpKernel ());
73
73
// Here are the results we expect, from hand calculations:
@@ -116,10 +116,10 @@ TEST_F(QuantizedMatMulTest, Small_withNegBias) {
116
116
AddInputFromArray<qint8>(TensorShape ({3 , 4 }),
117
117
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
118
118
AddInputFromArray<qint32>(TensorShape ({4 }), {100 , -200 , 300 , -400 });
119
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
120
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
121
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
122
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
119
+ AddInputFromArray<float >(TensorShape ({}), {0 });
120
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
121
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
122
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
123
123
124
124
TF_ASSERT_OK (RunOpKernel ());
125
125
// Here are the results we expect, from hand calculations:
@@ -178,10 +178,10 @@ TEST_F(QuantizedMatMulTest, Small_WithNegInp) {
178
178
AddInputFromArray<qint8>(TensorShape ({3 , 2 }), {1 , 4 , 2 , 5 , 3 , 6 });
179
179
// Bias
180
180
AddInputFromArray<float >(TensorShape ({2 }), {10 .0f , 20 .0f });
181
- AddInputFromArray<float >(TensorShape ({1 }), {-12 .0f });
182
- AddInputFromArray<float >(TensorShape ({1 }), {243 .0f });
183
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
184
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
181
+ AddInputFromArray<float >(TensorShape ({}), {-12 .0f });
182
+ AddInputFromArray<float >(TensorShape ({}), {243 .0f });
183
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
184
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
185
185
186
186
TF_ASSERT_OK (RunOpKernel ());
187
187
// First calculate C = A * B,
@@ -240,12 +240,12 @@ TEST_F(QuantizedMatMulTest, Small_withBiasAndReq) {
240
240
AddInputFromArray<qint8>(TensorShape ({3 , 4 }),
241
241
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
242
242
AddInputFromArray<qint32>(TensorShape ({4 }), {10 , -20 , 30 , -40 });
243
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
244
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
245
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
246
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
247
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
248
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
243
+ AddInputFromArray<float >(TensorShape ({}), {0 });
244
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
245
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
246
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
247
+ AddInputFromArray<float >(TensorShape ({}), {0 });
248
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
249
249
250
250
TF_ASSERT_OK (RunOpKernel ());
251
251
// Here are the results we expect, from hand calculations:
@@ -308,12 +308,12 @@ TEST_F(QuantizedMatMulTest, Small_withBiasAndDeq) {
308
308
AddInputFromArray<qint8>(TensorShape ({3 , 4 }),
309
309
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
310
310
AddInputFromArray<qint32>(TensorShape ({4 }), {10 , -20 , 30 , -40 });
311
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
312
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
313
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
314
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
315
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
316
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
311
+ AddInputFromArray<float >(TensorShape ({}), {0 });
312
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
313
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
314
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
315
+ AddInputFromArray<float >(TensorShape ({}), {0 });
316
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
317
317
318
318
TF_ASSERT_OK (RunOpKernel ());
319
319
// Here are the results we expect, from hand calculations:
@@ -375,10 +375,10 @@ TEST_F(QuantizedMatMulTest, Small_withBiasAndRelu) {
375
375
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
376
376
AddInputFromArray<float >(TensorShape ({4 }),
377
377
{100 .0f , -200 .0f , 300 .0f , -400 .0f });
378
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
379
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
380
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
381
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
378
+ AddInputFromArray<float >(TensorShape ({}), {0 });
379
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
380
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
381
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
382
382
383
383
TF_ASSERT_OK (RunOpKernel ());
384
384
// Here are the results we expect, from hand calculations:
@@ -431,12 +431,12 @@ TEST_F(QuantizedMatMulTest, Small_withBiasAndReluAndReq) {
431
431
AddInputFromArray<qint8>(TensorShape ({3 , 4 }),
432
432
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
433
433
AddInputFromArray<qint32>(TensorShape ({4 }), {10 , -20 , 30 , -40 });
434
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
435
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
436
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
437
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
438
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
439
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
434
+ AddInputFromArray<float >(TensorShape ({}), {0 });
435
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
436
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
437
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
438
+ AddInputFromArray<float >(TensorShape ({}), {0 });
439
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
440
440
441
441
TF_ASSERT_OK (RunOpKernel ());
442
442
// Here are the results we expect, from hand calculations:
@@ -502,10 +502,10 @@ TEST_F(QuantizedMatMulTest, Small_withWeightCached) {
502
502
AddInputFromArray<qint8>(TensorShape ({3 , 4 }),
503
503
{7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 });
504
504
AddInputFromArray<qint32>(TensorShape ({4 }), {1 , 2 , 3 , 4 });
505
- AddInputFromArray<float >(TensorShape ({1 }), {0 });
506
- AddInputFromArray<float >(TensorShape ({1 }), {255 .0f });
507
- AddInputFromArray<float >(TensorShape ({1 }), {-127 .0f });
508
- AddInputFromArray<float >(TensorShape ({1 }), {127 .0f });
505
+ AddInputFromArray<float >(TensorShape ({}), {0 });
506
+ AddInputFromArray<float >(TensorShape ({}), {255 .0f });
507
+ AddInputFromArray<float >(TensorShape ({}), {-127 .0f });
508
+ AddInputFromArray<float >(TensorShape ({}), {127 .0f });
509
509
510
510
int64 start_time = Env::Default ()->NowMicros ();
511
511
TF_ASSERT_OK (RunOpKernel ());
@@ -543,4 +543,4 @@ TEST_F(QuantizedMatMulTest, Small_withWeightCached) {
543
543
544
544
} // namespace tensorflow
545
545
546
- #endif // INTEL_MKL && ENABLE_MKL
546
+ #endif // INTEL_MKL
0 commit comments