Leo-arm commented on a change in pull request #8300:
URL: https://github.com/apache/tvm/pull/8300#discussion_r683282927
##########
File path: python/tvm/relay/op/contrib/ethosn.py
##########
@@ -61,6 +61,53 @@ def partition_for_ethosn(mod, params=None, **opts):
-------
ret : annotated and partitioned module.
"""
+ if opts:
+ tops = opts.get("tops", None)
+ ple_ratio = opts.get("ple_ratio", None)
+ sram_size = opts.get("sram_size", None)
+ if tops or ple_ratio or sram_size:
+ raise ValueError(
+ "Setting tops, ple_ratio or sram_size has no effect when
targeting Ethos-N77"
+ )
+
+ if params:
+ mod["main"] = bind_params_by_name(mod["main"], params)
+
+ seq = tvm.transform.Sequential(
+ [
+ transform.InferType(),
+ transform.MergeComposite(pattern_table()),
+ transform.AnnotateTarget("ethos-n"),
+ transform.MergeCompilerRegions(),
+ transform.PartitionGraph(),
+ ]
+ )
+
+ return seq(mod), None
+
+
+def partition_for_ethosn78(mod, params=None, **opts):
+ """Partition the graph greedily offloading supported
+ operators to Arm Ethos-N NPU.
+
+ Parameters
+ ----------
+ mod : Module
+ The module to run passes on.
+ params : Optional[Dict[str, NDArray]]
+ Constant input parameters.
+
+ Returns
+ -------
+ ret : annotated and partitioned module.
Review comment:
And a config
##########
File path: tests/python/contrib/test_ethosn/test_partition_params.py
##########
@@ -0,0 +1,104 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Ethos-N partition parameter tests"""
+
Review comment:
Missing file comment
##########
File path: tests/python/driver/tvmc/test_compiler.py
##########
@@ -308,6 +308,26 @@ def
test_compile_tflite_module_with_external_codegen(tflite_mobilenet_v1_1_quant
assert os.path.exists(dumps_path)
[email protected](
+ not ethosn_available(),
+ reason="--target=ethos-n78 is not available. TVM built with 'USE_ETHOSN
OFF'",
+)
+def
test_compile_tflite_module_with_external_codegen_ethos_n78(tflite_mobilenet_v1_1_quant):
+ pytest.importorskip("tflite")
+ tvmc_model = tvmc.load(tflite_mobilenet_v1_1_quant)
+ tvmc_package = tvmc.compile(
+ tvmc_model, target="ethos-n78 -variant=Ethos-N78, llvm",
dump_code="relay"
Review comment:
Is the double spec not what we wanted to avoid?
##########
File path: tests/python/driver/tvmc/test_tvmc_common.py
##########
@@ -241,6 +241,11 @@ def test_target_two_tvm_targets():
assert 0 == len(extra_targets)
+def test_target_from_cli__error_no_tvm_target_ethos_n78():
+ with pytest.raises(TVMCException):
+ _ = tvmc.common.target_from_cli("ethos-n78")
Review comment:
Why is this not valid? This would get the default config, I would have
thought.
##########
File path: tests/python/contrib/test_ethosn/test_partition_params.py
##########
@@ -0,0 +1,104 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Ethos-N partition parameter tests"""
+
+import pytest
+import tvm
+from tvm import relay
+import numpy as np
+
+from tvm.relay.op.contrib.ethosn import partition_for_ethosn77
+from tvm.relay.op.contrib.ethosn import partition_for_ethosn78
+
+fp32 = "float32"
Review comment:
This looks strange. If the tests pass when offloading float32, then I
would submit that the tests are broken because we only offload uint8. Am I
missing something?
##########
File path: tests/cpp/ethosn_test.cc
##########
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
Review comment:
Missing file comment.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
