From 19a7aaab3ff2a76408bab830153c8f3a5f1b29e7 Mon Sep 17 00:00:00 2001 From: Siva Rama Krishna Reddy B Date: Tue, 8 Nov 2022 22:53:23 +0530 Subject: [PATCH 1/2] [TRANSFORM] Fix virtual device anaotation issue with BYOC subgraphs Heterogeneous module partitioned by BYOC has functions nodes without any VirtualDevice definition (having FullyUnconstrained device). Ignoring the device here causes expr_virtual_devices_ being empty when PopVirtualDevice is called assuming above PushVirtualDevice is succeeded. PushVirtualDevice and PopVirtualDevice occurs as pairs across function body, hence it's better to insert the The Virtual Device for Uncontrained and Pop it subsequently. --- src/relay/transforms/device_aware_visitors.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/relay/transforms/device_aware_visitors.cc b/src/relay/transforms/device_aware_visitors.cc index e433e9a3cc88..f3ca1bfa3a9e 100644 --- a/src/relay/transforms/device_aware_visitors.cc +++ b/src/relay/transforms/device_aware_visitors.cc @@ -94,9 +94,6 @@ void LexicalOnDeviceMixin::ExitFunctionBody() { } void LexicalOnDeviceMixin::PushVirtualDevice(const VirtualDevice& virtual_device) { - if (virtual_device->IsFullyUnconstrained()) { - return; - } expr_virtual_devices_.emplace_back(virtual_device); } From 55b126c6b37ec6dabbef60505f8b0cd1c7a77396 Mon Sep 17 00:00:00 2001 From: Siva Rama Krishna Reddy B Date: Tue, 15 Nov 2022 17:46:23 +0530 Subject: [PATCH 2/2] * Test case --- .../python/contrib/test_clml/test_compiler.py | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tests/python/contrib/test_clml/test_compiler.py diff --git a/tests/python/contrib/test_clml/test_compiler.py b/tests/python/contrib/test_clml/test_compiler.py new file mode 100644 index 000000000000..973fbbd345f0 --- /dev/null +++ b/tests/python/contrib/test_clml/test_compiler.py @@ -0,0 +1,42 @@ +# 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. +"""CLML compiler tests.""" + +import tvm +import numpy as np +from tvm import relay +from tvm.relay import testing +from tvm.relay.op.contrib import clml +import pytest + + +@tvm.testing.requires_openclml +def test_device_annotation(): + mod, params = relay.testing.mobilenet.get_workload(batch_size=1) + mod = clml.partition_for_clml(mod, params) + with tvm.transform.PassContext(opt_level=3): + relay.backend.te_compiler.get().clear() + lib = relay.build( + mod, + target="opencl -device=adreno", + target_host="llvm -mtriple=aarch64-linux-gnu", + params=params, + ) + + +if __name__ == "__main__": + tvm.testing.main()