Revert some wrong editions in NeuralNetworksWrapper.h

daquexian · daquexian · commit afdec77ae8ea · 2019-05-13T15:22:06.000+08:00
diff --git a/dnnlibrary/include/NeuralNetworksWrapper.h b/dnnlibrary/include/NeuralNetworksWrapper.h
@@ -74,7 +74,6 @@ struct SymmPerChannelQuantParams {
 // A helper function
 inline bool isScalarType(const Type &type) {
     return type == Type::FLOAT16 || type == Type::FLOAT32 || type == Type::INT32 || type == Type::BOOL || type == Type::UINT32;
-    return type == Type::FLOAT32 || type == Type::INT32 || type == Type::UINT32;
 }
 
 inline std::string typeToStr(const Type &type) {
@@ -149,7 +148,6 @@ struct OperandType {
     }
     bool isQuant() const {
         return type == Type::TENSOR_QUANT8_SYMM_PER_CHANNEL || type == Type::TENSOR_QUANT16_SYMM || type == Type::TENSOR_QUANT16_ASYMM || type == Type::TENSOR_QUANT8_ASYMM || type == Type::TENSOR_INT32;
-        return type == Type::TENSOR_QUANT8_ASYMM || type == Type::TENSOR_INT32;
     }
     operator ANeuralNetworksOperandType() const {return operandType; }
 };

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ struct SymmPerChannelQuantParams {`
`74`	`74`	`// A helper function`
`75`	`75`	`inline bool isScalarType(const Type &type) {`
`76`	`76`	`return type == Type::FLOAT16 \|\| type == Type::FLOAT32 \|\| type == Type::INT32 \|\| type == Type::BOOL \|\| type == Type::UINT32;`
`77`		`- return type == Type::FLOAT32 \|\| type == Type::INT32 \|\| type == Type::UINT32;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`inline std::string typeToStr(const Type &type) {`
`@@ -149,7 +148,6 @@ struct OperandType {`
`149`	`148`	`}`
`150`	`149`	`bool isQuant() const {`
`151`	`150`	`return type == Type::TENSOR_QUANT8_SYMM_PER_CHANNEL \|\| type == Type::TENSOR_QUANT16_SYMM \|\| type == Type::TENSOR_QUANT16_ASYMM \|\| type == Type::TENSOR_QUANT8_ASYMM \|\| type == Type::TENSOR_INT32;`
`152`		`- return type == Type::TENSOR_QUANT8_ASYMM \|\| type == Type::TENSOR_INT32;`
`153`	`151`	`}`
`154`	`152`	`operator ANeuralNetworksOperandType() const {return operandType; }`
`155`	`153`	`};`