From 3a4785772a0f076e2e9653ad70dbb2fc412ac302 Mon Sep 17 00:00:00 2001 From: Kevin Cheng Date: Fri, 22 Jan 2021 17:21:02 -0800 Subject: Remove AINT8 - Updated C and Py serialization libraries, updated licence files - Removed AINT8 from TOSA reference tests Signed-off-by: Kevin Cheng Signed-off-by: Jared Smolens Change-Id: I860bfeaad5a075e50f569c8f6861927ebacf1378 --- reference_model/src/ops/tensor_ops.cc | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'reference_model/src/ops/tensor_ops.cc') diff --git a/reference_model/src/ops/tensor_ops.cc b/reference_model/src/ops/tensor_ops.cc index 82ce3d2..d6cd1cd 100644 --- a/reference_model/src/ops/tensor_ops.cc +++ b/reference_model/src/ops/tensor_ops.cc @@ -1,5 +1,5 @@ -// Copyright (c) 2020, ARM Limited. +// Copyright (c) 2020-2021, ARM Limited. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -1189,41 +1189,37 @@ int OpTransposeConv2d::eval() // template explicit instantiation DEF_INSTANTIATE_RANK1_6_ONE_RANK_ONE_TYPE(OpArgMax, FLOAT); -DEF_INSTANTIATE_RANK1_6_ONE_RANK_ONE_TYPE(OpArgMax, AINT8); +DEF_INSTANTIATE_RANK1_6_ONE_RANK_ONE_TYPE(OpArgMax, INT8); DEF_INSTANTIATE_RANK1_6_ONE_RANK_ONE_TYPE(OpArgMax, INT16); DEF_INSTANTIATE_ONE_TYPE(OpAvgPool2d, FLOAT) -DEF_INSTANTIATE_ONE_TYPE(OpAvgPool2d, AINT8) +DEF_INSTANTIATE_ONE_TYPE(OpAvgPool2d, INT8) DEF_INSTANTIATE_ONE_TYPE(OpAvgPool2d, INT16) DEF_INSTANTIATE_TWO_TYPE(OpConv2d, FLOAT, FLOAT); -DEF_INSTANTIATE_TWO_TYPE(OpConv2d, AINT8, INT4); -DEF_INSTANTIATE_TWO_TYPE(OpConv2d, AINT8, INT8); -DEF_INSTANTIATE_TWO_TYPE(OpConv2d, AINT8, AINT8); +DEF_INSTANTIATE_TWO_TYPE(OpConv2d, INT8, INT4); +DEF_INSTANTIATE_TWO_TYPE(OpConv2d, INT8, INT8); DEF_INSTANTIATE_TWO_TYPE(OpConv2d, INT16, INT8); DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, FLOAT, FLOAT); -DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, AINT8, INT4); -DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, AINT8, INT8); -DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, AINT8, AINT8); +DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, INT8, INT4); +DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, INT8, INT8); DEF_INSTANTIATE_TWO_TYPE(OpDepthwiseConv2d, INT16, INT8); DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, FLOAT, FLOAT); -DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, AINT8, INT4); -DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, AINT8, INT8); -DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, AINT8, AINT8); +DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, INT8, INT4); +DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, INT8, INT8); DEF_INSTANTIATE_TWO_TYPE(OpFullyConnected, INT16, INT8); -DEF_INSTANTIATE_ONE_TYPE(OpMatMul, AINT8); +DEF_INSTANTIATE_ONE_TYPE(OpMatMul, INT8); DEF_INSTANTIATE_ONE_TYPE(OpMatMul, INT16); DEF_INSTANTIATE_ONE_TYPE(OpMatMul, FLOAT); DEF_INSTANTIATE_ONE_TYPE(OpMaxPool2d, FLOAT); -DEF_INSTANTIATE_ONE_TYPE(OpMaxPool2d, AINT8); +DEF_INSTANTIATE_ONE_TYPE(OpMaxPool2d, INT8); DEF_INSTANTIATE_ONE_TYPE(OpMaxPool2d, INT16); DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, FLOAT, FLOAT); -DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, AINT8, INT4); -DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, AINT8, INT8); -DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, AINT8, AINT8); +DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, INT8, INT4); +DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, INT8, INT8); DEF_INSTANTIATE_TWO_TYPE(OpTransposeConv2d, INT16, INT8); -- cgit v1.2.1