update onnx and enable tests for qlinearconv (#840)

This commit is contained in:
Ashwini Khade 2019-04-16 09:43:17 -07:00 committed by GitHub
parent 7775551a6f
commit 07e6dfa7ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 13 deletions

View file

@ -49,7 +49,7 @@
"component":{
"type":"git",
"git":{
"commitHash":"a80c3371a6514bd11664249e59cae958f45b3b59",
"commitHash":"3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5",
"repositoryUrl":"https://github.com/onnx/onnx.git"
}
}

2
cmake/external/onnx vendored

@ -1 +1 @@
Subproject commit a80c3371a6514bd11664249e59cae958f45b3b59
Subproject commit 3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5

View file

@ -8,9 +8,7 @@ namespace onnxruntime {
namespace test {
namespace {
// There is a bug in onnx shapeinference for this op.
// TODO Enable this test after bug fix
/*
void FindMinMax(const vector<float>& vec, float* min,
float* max) {
*min = *max = 0;
@ -104,7 +102,7 @@ TEST(ConvTest, QLinearConv2DTest) {
test.AddOutput<uint8_t>("y", Y_shape, result_quantized);
//test.Run();
test.Run();
}
TEST(ConvTest, QLinearConv3DTest) {
@ -175,9 +173,8 @@ TEST(ConvTest, QLinearConv3DTest) {
test.AddOutput<uint8_t>("y", Y_shape, result_quantized);
//test.Run();
test.Run();
}
*/
} // namespace
} // namespace test

View file

@ -38,9 +38,8 @@ else
#5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
#bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
#9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
#7a112a6f930aac375da5a38d744ccda93e37632c" is v1.4.1
#a80c3371a6514bd11664249e59cae958f45b3b59 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7a112a6f930aac375da5a38d744ccda93e37632c" "a80c3371a6514bd11664249e59cae958f45b3b59"; do
#3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5" is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5"; do
if [ -z ${lastest_onnx_version+x} ]; then
echo "first pass";
else

View file

@ -32,8 +32,8 @@ else
#5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
#bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
#9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
#7a112a6f930aac375da5a38d744ccda93e37632c is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7a112a6f930aac375da5a38d744ccda93e37632c"; do
#3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "3717dc617fa06e4eea326e85dc0ccfdcdf4f4ab5"; do
if [ -z ${lastest_onnx_version+x} ]; then
echo "first pass";
else