From cdd68c02f5a5b5e25a9f6ebcd1b6bc12831e8b49 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Thu, 23 Aug 2018 15:03:41 +0100 Subject: COMPMID-1534: Prevent graphs with missing NEON F16 features from running Change-Id: I9954e4240cf621819b2b028972e4cd4065485213 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/145399 Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- examples/graph_alexnet.cpp | 2 +- examples/graph_googlenet.cpp | 3 ++- examples/graph_inception_resnet_v2.cpp | 3 ++- examples/graph_inception_v3.cpp | 3 ++- examples/graph_inception_v4.cpp | 3 ++- examples/graph_lenet.cpp | 2 +- examples/graph_mobilenet.cpp | 3 +++ examples/graph_mobilenet_v2.cpp | 4 ++++ examples/graph_resnet50.cpp | 3 ++- examples/graph_resnet_v2_50.cpp | 3 ++- examples/graph_resnext50.cpp | 3 ++- examples/graph_squeezenet.cpp | 3 ++- examples/graph_squeezenet_v1_1.cpp | 3 ++- examples/graph_vgg16.cpp | 2 +- examples/graph_vgg19.cpp | 2 +- 15 files changed, 29 insertions(+), 13 deletions(-) (limited to 'examples') diff --git a/examples/graph_alexnet.cpp b/examples/graph_alexnet.cpp index 8394587c60..124f672e72 100644 --- a/examples/graph_alexnet.cpp +++ b/examples/graph_alexnet.cpp @@ -65,7 +65,7 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_googlenet.cpp b/examples/graph_googlenet.cpp index d5bd0c0552..cdbb8d8f2b 100644 --- a/examples/graph_googlenet.cpp +++ b/examples/graph_googlenet.cpp @@ -59,7 +59,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_inception_resnet_v2.cpp b/examples/graph_inception_resnet_v2.cpp index 6c52132b2e..c087c1a808 100644 --- a/examples/graph_inception_resnet_v2.cpp +++ b/examples/graph_inception_resnet_v2.cpp @@ -65,7 +65,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_inception_v3.cpp b/examples/graph_inception_v3.cpp index 3d35117891..168a506c8f 100644 --- a/examples/graph_inception_v3.cpp +++ b/examples/graph_inception_v3.cpp @@ -65,7 +65,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_inception_v4.cpp b/examples/graph_inception_v4.cpp index 1ca8c5fbea..b6c28b4c3f 100644 --- a/examples/graph_inception_v4.cpp +++ b/examples/graph_inception_v4.cpp @@ -65,7 +65,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_lenet.cpp b/examples/graph_lenet.cpp index c658d1b361..6b9f302312 100644 --- a/examples/graph_lenet.cpp +++ b/examples/graph_lenet.cpp @@ -59,7 +59,7 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_mobilenet.cpp b/examples/graph_mobilenet.cpp index a8b0f4789c..cab578adf2 100644 --- a/examples/graph_mobilenet.cpp +++ b/examples/graph_mobilenet.cpp @@ -67,6 +67,9 @@ public: return false; } + // Checks + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); + // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_mobilenet_v2.cpp b/examples/graph_mobilenet_v2.cpp index 63dcba6950..9ea2ec0c5b 100644 --- a/examples/graph_mobilenet_v2.cpp +++ b/examples/graph_mobilenet_v2.cpp @@ -61,6 +61,10 @@ public: return false; } + // Checks + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); + // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_resnet50.cpp b/examples/graph_resnet50.cpp index 4221d98048..abe3a09e42 100644 --- a/examples/graph_resnet50.cpp +++ b/examples/graph_resnet50.cpp @@ -59,7 +59,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_resnet_v2_50.cpp b/examples/graph_resnet_v2_50.cpp index 3db08c44d3..704e0e420e 100644 --- a/examples/graph_resnet_v2_50.cpp +++ b/examples/graph_resnet_v2_50.cpp @@ -59,7 +59,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_resnext50.cpp b/examples/graph_resnext50.cpp index e7ef013f17..8f8e4a96f0 100644 --- a/examples/graph_resnext50.cpp +++ b/examples/graph_resnext50.cpp @@ -59,7 +59,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_squeezenet.cpp b/examples/graph_squeezenet.cpp index b539a9bc34..6cdb9de03a 100644 --- a/examples/graph_squeezenet.cpp +++ b/examples/graph_squeezenet.cpp @@ -59,7 +59,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_squeezenet_v1_1.cpp b/examples/graph_squeezenet_v1_1.cpp index bafd6a9fc7..f0b2b84a3d 100644 --- a/examples/graph_squeezenet_v1_1.cpp +++ b/examples/graph_squeezenet_v1_1.cpp @@ -59,7 +59,8 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); + ARM_COMPUTE_EXIT_ON_MSG(common_params.data_type == DataType::F16 && common_params.target == Target::NEON, "F16 NEON not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_vgg16.cpp b/examples/graph_vgg16.cpp index 808ce08ce7..69b3a9d955 100644 --- a/examples/graph_vgg16.cpp +++ b/examples/graph_vgg16.cpp @@ -59,7 +59,7 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; diff --git a/examples/graph_vgg19.cpp b/examples/graph_vgg19.cpp index 96a1d8a9d4..8d64c1cdbb 100644 --- a/examples/graph_vgg19.cpp +++ b/examples/graph_vgg19.cpp @@ -58,7 +58,7 @@ public: } // Checks - ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "Unsupported data type!"); + ARM_COMPUTE_EXIT_ON_MSG(arm_compute::is_data_type_quantized_asymmetric(common_params.data_type), "QASYMM8 not supported for this graph"); // Print parameter values std::cout << common_params << std::endl; -- cgit v1.2.1