Save Int16/UINT16 test outputs to native dtypes
* Int16/UInt16 reference outputs were previously saved to INT32
* Save those in their native dtypes and updated other affected code
Signed-off-by: Jerry Ge <jerry.ge@arm.com>
Change-Id: I0c3b7fba096a8cb1ddabef20ad13498b8f46d36f
diff --git a/reference_model/src/tensor.h b/reference_model/src/tensor.h
index 1659a2f..26c6aa7 100644
--- a/reference_model/src/tensor.h
+++ b/reference_model/src/tensor.h
@@ -239,22 +239,24 @@
virtual int dumpTensorParams(FILE* out) const;
virtual int dumpTensorParams(std::ostream& out) const;
- virtual int setTensorValueDouble(const size_t bufLen, const double* vals) = 0;
- virtual int setTensorValueFloat(const size_t bufLen, const float* vals) = 0;
- virtual int setTensorValueUInt8(const size_t bufLen, const uint8_t* vals) = 0;
- virtual int setTensorValueInt8(const size_t bufLen, const int8_t* vals) = 0;
- virtual int setTensorValueInt16(const size_t bufLen, const int16_t* vals) = 0;
- virtual int setTensorValueInt32(const size_t bufLen, const int32_t* vals) = 0;
- virtual int setTensorValueInt64(const size_t bufLen, const int64_t* vals) = 0;
- virtual int setTensorValueBool(const size_t bufLen, const bool* vals) = 0;
- virtual int getTensorValueDouble(const size_t bufLen, double* fbuf) const = 0;
- virtual int getTensorValueFloat(const size_t bufLen, float* fbuf) const = 0;
- virtual int getTensorValueUInt8(const size_t bufLen, uint8_t* ibuf) const = 0;
- virtual int getTensorValueInt8(const size_t bufLen, int8_t* ibuf) const = 0;
- virtual int getTensorValueInt16(const size_t bufLen, int16_t* ibuf) const = 0;
- virtual int getTensorValueInt32(const size_t bufLen, int32_t* ibuf) const = 0;
- virtual int getTensorValueInt64(const size_t bufLen, int64_t* ibuf) const = 0;
- virtual int getTensorValueBool(const size_t bufLen, bool* ibuf) const = 0;
+ virtual int setTensorValueDouble(const size_t bufLen, const double* vals) = 0;
+ virtual int setTensorValueFloat(const size_t bufLen, const float* vals) = 0;
+ virtual int setTensorValueUInt8(const size_t bufLen, const uint8_t* vals) = 0;
+ virtual int setTensorValueInt8(const size_t bufLen, const int8_t* vals) = 0;
+ virtual int setTensorValueUInt16(const size_t bufLen, const uint16_t* vals) = 0;
+ virtual int setTensorValueInt16(const size_t bufLen, const int16_t* vals) = 0;
+ virtual int setTensorValueInt32(const size_t bufLen, const int32_t* vals) = 0;
+ virtual int setTensorValueInt64(const size_t bufLen, const int64_t* vals) = 0;
+ virtual int setTensorValueBool(const size_t bufLen, const bool* vals) = 0;
+ virtual int getTensorValueDouble(const size_t bufLen, double* fbuf) const = 0;
+ virtual int getTensorValueFloat(const size_t bufLen, float* fbuf) const = 0;
+ virtual int getTensorValueUInt8(const size_t bufLen, uint8_t* ibuf) const = 0;
+ virtual int getTensorValueInt8(const size_t bufLen, int8_t* ibuf) const = 0;
+ virtual int getTensorValueUInt16(const size_t bufLen, uint16_t* ibuf) const = 0;
+ virtual int getTensorValueInt16(const size_t bufLen, int16_t* ibuf) const = 0;
+ virtual int getTensorValueInt32(const size_t bufLen, int32_t* ibuf) const = 0;
+ virtual int getTensorValueInt64(const size_t bufLen, int64_t* ibuf) const = 0;
+ virtual int getTensorValueBool(const size_t bufLen, bool* ibuf) const = 0;
virtual int readFromNpyFile(const char* filename);
virtual int writeToNpyFile(const char* filename) const;
@@ -264,6 +266,7 @@
virtual int readfromVector(const ArrayProxy<float> vals);
virtual int readfromVector(const ArrayProxy<half_float::half> vals);
virtual int readfromVector(const ArrayProxy<int8_t> vals);
+ virtual int readfromVector(const ArrayProxy<uint16_t> vals);
virtual int readfromVector(const ArrayProxy<int16_t> vals);
virtual int readfromVector(const ArrayProxy<int32_t> vals);
virtual int readfromVector(const ArrayProxy<int64_t> vals);
@@ -273,6 +276,7 @@
virtual int writeToVector(ArrayProxy<float> vals);
virtual int writeToVector(ArrayProxy<half_float::half> vals);
virtual int writeToVector(ArrayProxy<int8_t> vals);
+ virtual int writeToVector(ArrayProxy<uint16_t> vals);
virtual int writeToVector(ArrayProxy<int16_t> vals);
virtual int writeToVector(ArrayProxy<int32_t> vals);
virtual int writeToVector(ArrayProxy<int64_t> vals);
@@ -369,6 +373,7 @@
virtual int setTensorValueFloat(const size_t bufLen, const float* vals);
virtual int setTensorValueUInt8(const size_t bufLen, const uint8_t* vals);
virtual int setTensorValueInt8(const size_t bufLen, const int8_t* vals);
+ virtual int setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
virtual int setTensorValueInt16(const size_t bufLen, const int16_t* vals);
virtual int setTensorValueInt32(const size_t bufLen, const int32_t* vals);
virtual int setTensorValueInt64(const size_t bufLen, const int64_t* vals);
@@ -378,6 +383,7 @@
virtual int getTensorValueFloat(const size_t bufLen, float* fbuf) const;
virtual int getTensorValueUInt8(const size_t bufLen, uint8_t* ibuf) const;
virtual int getTensorValueInt8(const size_t bufLen, int8_t* ibuf) const;
+ virtual int getTensorValueUInt16(const size_t bufLen, uint16_t* ibuf) const;
virtual int getTensorValueInt16(const size_t bufLen, int16_t* ibuf) const;
virtual int getTensorValueInt32(const size_t bufLen, int32_t* ibuf) const;
virtual int getTensorValueInt64(const size_t bufLen, int64_t* ibuf) const;
@@ -572,6 +578,21 @@
int Tensor6<int32_t>::setTensorValueInt8(const size_t bufLen, const int8_t* vals);
template <>
+int Tensor0<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+template <>
+int Tensor1<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+template <>
+int Tensor2<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+template <>
+int Tensor3<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+template <>
+int Tensor4<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+template <>
+int Tensor5<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+template <>
+int Tensor6<int32_t>::setTensorValueUInt16(const size_t bufLen, const uint16_t* vals);
+
+template <>
int Tensor0<int32_t>::setTensorValueInt16(const size_t bufLen, const int16_t* vals);
template <>
int Tensor1<int32_t>::setTensorValueInt16(const size_t bufLen, const int16_t* vals);
@@ -632,6 +653,21 @@
int Tensor6<int32_t>::getTensorValueInt8(const size_t bufLen, int8_t* vals) const;
template <>
+int Tensor0<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+template <>
+int Tensor1<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+template <>
+int Tensor2<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+template <>
+int Tensor3<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+template <>
+int Tensor4<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+template <>
+int Tensor5<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+template <>
+int Tensor6<int32_t>::getTensorValueUInt16(const size_t bufLen, uint16_t* vals) const;
+
+template <>
int Tensor0<int32_t>::getTensorValueInt16(const size_t bufLen, int16_t* vals) const;
template <>
int Tensor1<int32_t>::getTensorValueInt16(const size_t bufLen, int16_t* vals) const;