Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Transform] Use callable() instead of isinstance() for type checking #14248

Merged
merged 1 commit into from
Mar 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions python/tvm/ir/transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# under the License.
# pylint: disable=invalid-name,unused-argument
"""Common pass infrastructure across IR variants."""
import types
import inspect
import functools

Expand Down Expand Up @@ -340,7 +339,7 @@ def create_module_pass(pass_arg):
info = PassInfo(opt_level, fname, required)
if inspect.isclass(pass_arg):
return _wrap_class_module_pass(pass_arg, info)
if not isinstance(pass_arg, (types.FunctionType, types.LambdaType)):
if not callable(pass_arg):
raise TypeError("pass_func must be a callable for Module pass")
return _ffi_transform_api.MakeModulePass(pass_arg, info)

Expand Down
2 changes: 1 addition & 1 deletion python/tvm/relay/transform/transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ def create_function_pass(pass_arg):
info = tvm.transform.PassInfo(opt_level, fname, required)
if inspect.isclass(pass_arg):
return _wrap_class_function_pass(pass_arg, info)
if not isinstance(pass_arg, (types.FunctionType, types.LambdaType)):
if not callable(pass_arg):
raise TypeError("pass_func must be a callable for Module pass")
return _ffi_api.MakeFunctionPass(pass_arg, info)

Expand Down
3 changes: 1 addition & 2 deletions python/tvm/te/hybrid/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import operator
import logging
import sys
import types
import numbers

from enum import Enum
Expand Down Expand Up @@ -142,7 +141,7 @@ def __init__(self, args, usage, symbols, closure_vars, func_name=None):

self.symbols = {} # Symbol table
for k, v in symbols.items():
if isinstance(v, types.FunctionType):
if callable(v):
self.add_symbol(k, Symbol.Callable, v)

self.closure_vars = closure_vars
Expand Down
3 changes: 1 addition & 2 deletions python/tvm/tir/transform/function_pass.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# under the License.
"""TIR specific function pass support."""
import inspect
import types
import functools
from typing import Callable, List, Optional, Union

Expand Down Expand Up @@ -151,7 +150,7 @@ def create_function_pass(pass_arg):
info = PassInfo(opt_level, fname, required)
if inspect.isclass(pass_arg):
return _wrap_class_function_pass(pass_arg, info)
if not isinstance(pass_arg, (types.FunctionType, types.LambdaType)):
if not callable(pass_arg):
raise TypeError("pass_func must be a callable for Module pass")
return _ffi_api.CreatePrimFuncPass(pass_arg, info) # type: ignore

Expand Down