From bc2a3db54ecee48fe2236f7fc03da8fd07d81ca0 Mon Sep 17 00:00:00 2001 From: Jeremy Johnson Date: Tue, 27 Sep 2022 13:50:00 +0100 Subject: Rename FLOAT type to FP32 Update tensor operations naming to state input type as TxT in all cases. Effects CONV2D, CONV3D, DEPTHWISE_CONV2D, FULLY_CONNECTED, TRANSPOSE_CONV2D. Signed-off-by: Jeremy Johnson Change-Id: Ic959acfcb3aa0a910b33b774a5a85fac08219205 --- reference_model/src/ops/ewise_unary.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'reference_model/src/ops/ewise_unary.cc') diff --git a/reference_model/src/ops/ewise_unary.cc b/reference_model/src/ops/ewise_unary.cc index 52f5aff..00897cc 100644 --- a/reference_model/src/ops/ewise_unary.cc +++ b/reference_model/src/ops/ewise_unary.cc @@ -78,7 +78,7 @@ int OpAbs::register_fcn() { switch (Dtype) { - case DType_FLOAT: + case DType_FP32: case DType_FP16: case DType_INT32: this->fcn = [](InEigenType a) -> OutEigenType { return a > (InEigenType)0 ? a : (-a); }; @@ -113,7 +113,7 @@ int OpCeil::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { return ceilf(a); }; break; default: @@ -161,7 +161,7 @@ int OpExp::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { return expf(a); }; break; default: @@ -177,7 +177,7 @@ int OpFloor::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { return floorf(a); }; break; default: @@ -193,7 +193,7 @@ int OpLog::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { return logf(a); }; break; default: @@ -245,7 +245,7 @@ int OpNegate::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { InEigenType result = -(a); return result; @@ -297,7 +297,7 @@ int OpReciprocal::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { return 1.0 / a; }; break; default: @@ -313,7 +313,7 @@ int OpRsqrt::register_fcn() switch (Dtype) { case DType_FP16: - case DType_FLOAT: + case DType_FP32: this->fcn = [](InEigenType a) -> OutEigenType { return 1.0 / sqrtf(a); }; break; default: @@ -325,7 +325,7 @@ int OpRsqrt::register_fcn() // template explicit instantiation DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpAbs, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpAbs, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpAbs, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpAbs, INT32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpBitwiseNot, INT8); @@ -333,29 +333,29 @@ DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpBitwiseNot, INT16); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpBitwiseNot, INT32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpCeil, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpCeil, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpCeil, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpClz, INT32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpExp, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpExp, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpExp, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpFloor, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpFloor, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpFloor, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpLog, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpLog, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpLog, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpLogicalNot, BOOL); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpNegate, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpNegate, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpNegate, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpNegate, INT8); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpNegate, INT16); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpNegate, INT32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpRsqrt, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpRsqrt, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpRsqrt, FP32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpReciprocal, FP16); -DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpReciprocal, FLOAT); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_ONE_TYPE(OpReciprocal, FP32); -- cgit v1.2.1