Warnings fix for tests. Spotted by cl compiler (#5616)

This commit is contained in:
Maksim Derbasov authored and GitHub committed 2021-05-14 13:08:23 +03:00
1 parent 79e197218e
commit 4d1cd0e79d
9 files changed
+20 -20

No files matched your search

@@ -41,7 +41,7 @@ inline float asfloat(uint32_t v) {
return f;
}
// Function to convert F32 into F16
// Function to convert F16 into F32
float f16tof32(ie_fp16 x) {
// this is storage for output result
uint32_t u = static_cast<uint32_t>(x);
@@ -70,7 +70,7 @@ void ConcatMultiInput::GenerateConstOnlyModel() {
ngraph::OutputVector concatInputs;
const int seed = 0;
std::mt19937 gen(static_cast<float>(seed));
std::mt19937 gen(seed);
auto generateFloatNumbers = [gen](std::size_t vec_len, float min, float max) mutable {
std::vector<float> res;
@@ -74,7 +74,7 @@ void FqConvFqAffineTest::SetUp() {
auto params = ngraph::builder::makeParams(ngPrc, {inputShape});
const int seed = 0;
std::mt19937 gen(static_cast<float>(seed));
std::mt19937 gen(seed);
auto inputFQNode = ngraph::builder::makeFakeQuantize(params[0], ngraph::element::f32, levels[0], std::vector<size_t>{},
{ inputDataMin }, { inputDataMax }, { inputDataMin }, { inputDataMax });
@@ -33,7 +33,7 @@ void MemoryEltwiseReshapeConcatTest::SetUp() {
ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
const int seed = 0;
std::mt19937 gen(static_cast<float>(seed));
std::mt19937 gen(seed);
auto generateFloatNumbers = [gen](std::size_t vec_len, float min, float max) mutable {
std::vector<float> res;
@@ -30,9 +30,9 @@ namespace SubgraphTestsDefinitions {
auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
const int seed = 0;
std::mt19937 gen(static_cast<float>(seed));
std::mt19937 gen(seed);
std::uniform_real_distribution<float> dist(-0.2f, 0.2f);
for (int i = 0; i < hiddenSize; ++i)
for (size_t i = 0; i < hiddenSize; ++i)
memory_init.emplace_back(static_cast<float>(dist(gen)));
auto input = ngraph::builder::makeParams(ngPrc, { {1, inputSize} });
@@ -68,7 +68,7 @@ void FakeQuantizeSubgraphTest::SetUp() {
auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ngraph::op::Parameter>(params));
const int seed = 0;
std::mt19937 gen(static_cast<float>(seed));
std::mt19937 gen(seed);
auto generateFloatNumbers = [gen](std::size_t vec_len, float min, float max) mutable {
@@ -53,7 +53,7 @@ inline std::vector<float> generate_float_numbers(std::size_t vec_len, float min,
*/
template<typename T>
inline std::vector<T> fill_vector(std::vector<T> &res, double min, double max, int seed = 0) {
std::mt19937 gen(static_cast<T>(seed));
std::mt19937 gen(seed);
std::uniform_real_distribution<double> dist(min, max);
for (std::size_t i = 0; i < res.size(); i++)
@@ -231,9 +231,9 @@ void inline fill_data_random(InferenceEngine::Blob::Ptr &blob, const uint32_t ra
*/
template<InferenceEngine::Precision::ePrecision PRC>
void inline fill_random_unique_sequence(InferenceEngine::Blob::Ptr &blob,
uint32_t range,
int32_t start_from = 0,
const int32_t k = 1,
uint64_t range,
int64_t start_from = 0,
const int64_t k = 1,
const int32_t seed = 1) {
using dataType = typename InferenceEngine::PrecisionTrait<PRC>::value_type;
auto *rawBlobDataPtr = blob->buffer().as<dataType *>();
@@ -247,7 +247,7 @@ void inline fill_random_unique_sequence(InferenceEngine::Blob::Ptr &blob,
}
std::mt19937 generator(seed);
std::uniform_int_distribution<int32_t> dist(k * start_from, k * (start_from + range));
std::uniform_int_distribution<int64_t> dist(k * start_from, k * (start_from + range));
std::set<dataType> elems;
while (elems.size() != blob->size()) {
@@ -88,7 +88,7 @@ public:
return std::shared_ptr<Layer>(new Layer(parent, id, common_attributes));
}
Port &getPortById(int64_t id) const {
Port &getPortById(size_t id) const {
if (id >= m_ports.size()) {
IE_THROW() << "Out of range: a port with id " << id << " not found";
}
@@ -228,10 +228,10 @@ compareBlobData(const InferenceEngine::Blob::Ptr &res, const InferenceEngine::Bl
}
for (size_t i = 0; i < ref_size / sizeof(dataType); i++) {
auto resVal = PRC == InferenceEngine::Precision::FP16 ? InferenceEngine::PrecisionUtils::f16tof32(res_ptr[i])
: res_ptr[i];
auto refVal = PRC == InferenceEngine::Precision::FP16 ? InferenceEngine::PrecisionUtils::f16tof32(ref_ptr[i])
: ref_ptr[i];
auto resVal = PRC == InferenceEngine::Precision::FP16 ? InferenceEngine::PrecisionUtils::f16tof32(static_cast<InferenceEngine::ie_fp16>(res_ptr[i]))
: static_cast<float>(res_ptr[i]);
auto refVal = PRC == InferenceEngine::Precision::FP16 ? InferenceEngine::PrecisionUtils::f16tof32(static_cast<InferenceEngine::ie_fp16>(ref_ptr[i]))
: static_cast<float>(ref_ptr[i]);
float absDiff = std::abs(resVal - refVal);
if (absDiff > max_diff) {
float relDiff = absDiff / std::max(res_ptr[i], ref_ptr[i]);
@@ -286,10 +286,10 @@ compareBlobs(const InferenceEngine::Blob::Ptr &res, const InferenceEngine::Blob:
inline void GetComparisonThreshold(InferenceEngine::Precision prc, float &absoluteThreshold, float &relativeThreshold) {
switch (prc) {
case InferenceEngine::Precision::FP32:
absoluteThreshold = relativeThreshold = 1e-4;
absoluteThreshold = relativeThreshold = 1e-4f;
break;
case InferenceEngine::Precision::FP16:
absoluteThreshold = relativeThreshold = 1e-2;
absoluteThreshold = relativeThreshold = 1e-2f;
break;
case InferenceEngine::Precision::I16:
case InferenceEngine::Precision::I8:
@@ -524,7 +524,7 @@ inline InferenceEngine::Blob::Ptr createAndFillBlobUniqueSequence(
InferenceEngine::Blob::Ptr blob = make_blob_with_precision(td);
blob->allocate();
auto shape = td.getDims();
auto range = std::accumulate(begin(shape), end(shape), 1, std::multiplies<uint64_t>()) * 2;
auto range = std::accumulate(begin(shape), end(shape), uint64_t(1), std::multiplies<uint64_t>()) * 2;
switch (td.getPrecision()) {
#define CASE(X) case X: CommonTestUtils::fill_random_unique_sequence<X>(blob, range, start_from, resolution, seed); break;
CASE(InferenceEngine::Precision::FP32)