This is an automated email from the ASF dual-hosted git repository.
manupa pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 210a192 [microNPU] Refactor section name test to remove
relay_ir_builder (#9658)
210a192 is described below
commit 210a192033aff22fb3dba44903dc26314ac4f576
Author: Grant Watson <[email protected]>
AuthorDate: Tue Dec 7 06:19:31 2021 +0000
[microNPU] Refactor section name test to remove relay_ir_builder (#9658)
Since we're in the process of removing relay_ir_builder,
I'm refactoring the test_ethosu_section_name test case
to remove it from there.
---
tests/python/contrib/test_ethosu/test_codegen.py | 69 ++++++++++--------------
1 file changed, 27 insertions(+), 42 deletions(-)
diff --git a/tests/python/contrib/test_ethosu/test_codegen.py
b/tests/python/contrib/test_ethosu/test_codegen.py
index 0efac76..6925f92 100644
--- a/tests/python/contrib/test_ethosu/test_codegen.py
+++ b/tests/python/contrib/test_ethosu/test_codegen.py
@@ -196,6 +196,22 @@ def _compare_ethosu_with_reference(
def _compare_tvm_with_tflite(
tf_func, shapes, accel_type, ranges=None, output_tolerance=0,
print_cmm=False
):
+ mod, tflite_graph = _get_tflite_graph(tf_func, shapes, ranges)
+
+ # Generate reference data
+ input_data, output_data = infra.generate_ref_data_tflite(tflite_graph)
+
+ _compare_ethosu_with_reference(
+ mod,
+ input_data,
+ output_data,
+ accel_type,
+ output_tolerance=output_tolerance,
+ print_cmm=print_cmm,
+ )
+
+
+def _get_tflite_graph(tf_func, shapes, ranges=None):
tensor_specs = [tf.TensorSpec(shape, dtype=tf.float32) for shape in shapes]
if not ranges:
ranges = [(0, 1) for _ in shapes]
@@ -225,18 +241,7 @@ def _compare_tvm_with_tflite(
relay_module, params = relay.frontend.from_tflite(tflite_model)
mod = partition_for_ethosu(relay_module, params)
-
- # Generate reference data
- input_data, output_data = infra.generate_ref_data_tflite(tflite_graph)
-
- _compare_ethosu_with_reference(
- mod,
- input_data,
- output_data,
- accel_type,
- output_tolerance=output_tolerance,
- print_cmm=print_cmm,
- )
+ return mod, tflite_graph
class EthosUAnnotator(ExprMutator):
@@ -743,40 +748,20 @@ def test_ethosu_unary_elementwise(
def test_ethosu_section_name():
- def create_graph_single(input_tensor_name, input_tensor_shape,
input_tensor_dtype):
- c1_params = relay_ir_builder.QnnConv2DParams(input_tensor_dtype)
- c1_params.ifm.shape = input_tensor_shape
- c1_params.kernel.shape = (3, 3, c1_params.ifm.shape[3], 32)
- c1_params.kernel.sc = relay.const(np.random.rand(32) * 2, "float32")
- c1_params.strides = (1, 1)
- c1_params.pad = "VALID"
- c1_params.update_output_qnn_params(
- input_tensor_dtype, input_tensor_dtype, input_tensor_dtype
- )
- input0 = relay.var(input_tensor_name, shape=c1_params.ifm.shape,
dtype=c1_params.ifm.dtype)
- c1, new_params = relay_ir_builder.create_qnn_conv2d(c1_params, input0)
- c1_params.ofm.shape = get_shape_expr(input0, c1)
-
- f = relay.Function([input0], c1)
- mod = tvm.IRModule()
- mod["main"] = f
- return mod, [c1_params]
+ @tf.function
+ def depthwise_conv2d(x):
+ weight_shape = [3, 3, 3, 1]
+ weight = tf.constant(np.random.uniform(size=weight_shape),
dtype=tf.float32)
+ tf_strides = [1, 1, 1, 1]
+ op = tf.nn.depthwise_conv2d(x, weight, strides=tf_strides,
padding="SAME", dilations=(2, 2))
+ return op
- accel_type = "ethos-u55-256"
- relay_module, _ = create_graph_single("input", (1, 300, 300, 3), "int8")
- input_dtype = "int8"
- mod = partition_for_ethosu(relay_module)
+ mod, tflite_graph = _get_tflite_graph(depthwise_conv2d, [(1, 55, 55, 3)])
# Generate reference data
- in_min, in_max = util.get_range_for_dtype_str(input_dtype)
- input_data = {
- "input": np.random.randint(in_min, high=in_max, size=(1, 300, 300, 3),
dtype=input_dtype)
- }
- output_data = generate_ref_data(relay_module, input_data)
+ input_data, output_data = infra.generate_ref_data_tflite(tflite_graph)
- compiled_models = infra.build_source(
- mod, input_data, output_data, accel_type, output_tolerance=1
- )
+ compiled_models = infra.build_source(mod, input_data, output_data)
# Assumes only two runtime.Modules are created -- i.e. single offload
module
ethosu_module =
compiled_models[0].executor_factory.lib.imported_modules[0].imported_modules[0]
