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

[Lang] Fix pylint rule W0612 (#3151) #3488

Merged
merged 2 commits into from Nov 14, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions python/taichi/cc_compose.py
Expand Up @@ -24,7 +24,6 @@ def do_group_begin(self, e):
self.launches = []

def do_group_end(self, e):
name = e['content']
self.groups[self.current_group] = list(self.launches)
self.current_group = None
self.launches = []
Expand Down Expand Up @@ -77,7 +76,6 @@ def do_compile_layout(self, e):
self.emit('')

def do_allocate_buffer(self, e):
root_size = e['root_size']
gtmp_size = e['gtmp_size']
extr_size = 4 * 1024 * 1024 # pinpoint: 4 MB

Expand Down Expand Up @@ -106,7 +104,6 @@ def do_allocate_buffer(self, e):
self.emit('')

def do_compile_kernel(self, e):
name = e['kernel_name']
source = e['kernel_source']

if self.emscripten:
Expand Down
4 changes: 2 additions & 2 deletions python/taichi/lang/__init__.py
Expand Up @@ -805,12 +805,12 @@ def run_benchmark():
# Use 3 initial iterations to warm up
# instruction/data caches. Discussion:
# https://github.com/taichi-dev/taichi/pull/1002#discussion_r426312136
for i in range(3):
for _ in range(3):
func(*args)
ti.sync()
ti.clear_kernel_profile_info()
t = time.time()
for n in range(repeat):
for _ in range(repeat):
func(*args)
ti.sync()
elapsed = time.time() - t
Expand Down
1 change: 0 additions & 1 deletion python/taichi/lang/ast_builder_utils.py
Expand Up @@ -101,7 +101,6 @@ def __enter__(self):
self.scopes.append({})

def __exit__(self, exc_type, exc_val, exc_tb):
local = self.scopes[-1]
self.scopes.pop()


Expand Down
2 changes: 0 additions & 2 deletions python/taichi/lang/ir_builder.py
Expand Up @@ -312,8 +312,6 @@ def build_FunctionDef(ctx, node):
assert args.kw_defaults == []
assert args.kwarg is None

arg_decls = []

def transform_as_kernel():
# Treat return type
if node.returns is not None:
Expand Down
8 changes: 3 additions & 5 deletions python/taichi/lang/kernel_impl.py
Expand Up @@ -96,7 +96,6 @@ def _get_tree_and_global_vars(self, args):
func_body = tree.body[0]
func_body.decorator_list = []

local_vars = {}
global_vars = _get_global_vars(self.func)

for i, arg in enumerate(func_body.args.args):
Expand Down Expand Up @@ -153,7 +152,7 @@ def __call__(self, *args):
if impl.get_runtime().current_kernel.is_grad:
raise TaichiSyntaxError(
"Real function in gradient kernels unsupported.")
instance_id, arg_features = self.mapper.lookup(args)
instance_id, _ = self.mapper.lookup(args)
key = _ti_core.FunctionKey(self.func.__name__, self.func_id,
instance_id)
if self.compiled is None:
Expand All @@ -171,7 +170,7 @@ def __call__(self, *args):
if impl.get_runtime().current_kernel.is_grad:
raise TaichiSyntaxError(
"Real function in gradient kernels unsupported.")
instance_id, arg_features = self.mapper.lookup(args)
instance_id, _ = self.mapper.lookup(args)
key = _ti_core.FunctionKey(self.func.__name__, self.func_id,
instance_id)
if self.compiled is None:
Expand Down Expand Up @@ -240,7 +239,6 @@ def do_compile_ast_refactor(self, key, args):

ast.increment_lineno(tree, oinspect.getsourcelines(self.func)[1] - 1)

local_vars = {}
global_vars = _get_global_vars(self.func)
# inject template parameters into globals
for i in self.template_slot_locations:
Expand Down Expand Up @@ -669,7 +667,7 @@ def call_back():

return call_back

assert util.has_pytorch()
assert has_torch
assert isinstance(v, torch.Tensor)
tmp = v
taichi_arch = self.runtime.prog.config.arch
Expand Down
24 changes: 9 additions & 15 deletions python/taichi/main.py
Expand Up @@ -194,7 +194,7 @@ def example(self, arguments: list = sys.argv[2:]):
try:
import rich.console # pylint: disable=C0415
import rich.syntax # pylint: disable=C0415
except ImportError as e:
except ImportError:
print('To make -P work, please: python3 -m pip install rich')
return 1
# https://rich.readthedocs.io/en/latest/syntax.html
Expand Down Expand Up @@ -916,13 +916,10 @@ def dist(self, arguments: list = sys.argv[2:]):
sys.argv.append(args.mode)
runpy.run_path('build.py')

@staticmethod
@register
def diagnose(self, arguments: list = sys.argv[2:]):
def diagnose(arguments: list = sys.argv[2:]):
"""System diagnose information"""
parser = argparse.ArgumentParser(
prog='ti diagnose', description=f"{self.diagnose.__doc__}")
args = parser.parse_args(arguments)

taichi.diagnose.main()

@register
Expand Down Expand Up @@ -952,13 +949,10 @@ def cc_compose(self, arguments: list = sys.argv[2:]):
taichi.cc_compose.main(args.fin_name, args.fout_name, args.hdrout_name,
args.emscripten)

@staticmethod
@register
def repl(self, arguments: list = sys.argv[2:]):
def repl(arguments: list = sys.argv[2:]):
"""Start Taichi REPL / Python shell with 'import taichi as ti'"""
parser = argparse.ArgumentParser(prog='ti repl',
description=f"{self.repl.__doc__}")
args = parser.parse_args(arguments)

def local_scope():

try:
Expand All @@ -971,13 +965,13 @@ def local_scope():

local_scope()

@staticmethod
@register
def lint(self, arguments: list = sys.argv[2:]):
def lint(arguments: list = sys.argv[2:]):
"""Run pylint checker for the Python codebase of Taichi"""
parser = argparse.ArgumentParser(prog='ti lint',
description=f"{self.lint.__doc__}")
# TODO: support arguments for lint specific files
args = parser.parse_args(arguments)
# parser = argparse.ArgumentParser(prog='ti lint', description=f"{self.lint.__doc__}")
# args = parser.parse_args(arguments)

options = [os.path.dirname(__file__)]

Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_pylint_tags.py
Expand Up @@ -8,7 +8,7 @@
'W0401': True,
'C0209': True,
'W0404': True,
'W0612': False,
'W0612': True,
'E1101': False,
'R0402': True,
'R0201': True,
Expand Down