Tianqi Chen
d883f5064f
## Summary
TVM-side cleanup that drops the `python/tvm/runtime/object.py` shim and
routes `tvm.runtime.Object` directly to `tvm_ffi.Object`. The
`tvm.runtime.Object` re-export is preserved (now a re-export of
`tvm_ffi.Object`) so external callers keep working.
The load-bearing `__object_repr__` install — which wires TVM IR objects
up to the rich C++ `ReprPrinter` registered through
`init_ffi_api("node", ...)` — moves into
`python/tvm/runtime/_ffi_node_api.py`.
That module is already imported as a side-effect-only module from
`python/tvm/runtime/__init__.py`, so the override fires at the right
time (after `init_ffi_api` registers the C++ printer).
`_ffi_node_api.AsRepr` itself is **kept**: `tvm_ffi`'s default repr is
primitive (`ClassName(ptr)`); TVM IR objects need the rich printer
registered via `init_ffi_api("node", ...)`. `AsRepr` is what bridges
that printer back into Python `repr(obj)` and is also the runtime-only
fallback when `libtvm.so` is unavailable.
The 7 in-tree importers of the deleted shim (plus one straggler in
`runtime/disco/session.py`) are switched to either
`from tvm.runtime import Object` or `from tvm_ffi import Object`,
depending on which pattern the file already uses.
## Test plan
- [x] `python -c "import tvm; print(repr(tvm.IRModule({})))"` produces
TVMScript-style output (rich repr preserved).
- [x] `pytest tests/python/all-platform-minimal-test/ -x` — 75 passed,
77 skipped (matches baseline).
- [x] `pytest tests/python/tirx-base/ -x` — 273 passed, 2 skipped.
- [x] `pre-commit run --files <changed files>` — all hooks pass.
- [ ] CI green.
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
# 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.
|
|
|
|
# pylint: disable=invalid-name, unused-argument
|
|
"""FFI for tvm.node"""
|
|
|
|
import tvm_ffi
|
|
import tvm_ffi.core
|
|
|
|
|
|
# The implementations below are default ones when the corresponding
|
|
# functions are not available in the runtime only mode.
|
|
# They will be overriden via tvm_ffi.init_ffi_api to the ones registered
|
|
def AsRepr(obj):
|
|
return type(obj).__name__ + "(" + obj.__ctypes_handle__().value + ")"
|
|
|
|
|
|
def SaveJSON(obj):
|
|
raise RuntimeError("Do not support object serialization in runtime only mode")
|
|
|
|
|
|
def LoadJSON(json_str):
|
|
raise RuntimeError("Do not support object serialization in runtime only mode")
|
|
|
|
|
|
# Exports functions registered in node namespace.
|
|
tvm_ffi.init_ffi_api("node", __name__)
|
|
|
|
# Override the default repr function for tvm_ffi.core.Object so TVM IR
|
|
# objects use the rich C++ ReprPrinter (registered above via init_ffi_api),
|
|
# falling back to the runtime-only AsRepr defined in this file when libtvm.so
|
|
# is not available.
|
|
tvm_ffi.core.__object_repr__ = AsRepr
|