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.

Sign up for GitHub

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

Jump to bottom

[FIX][CI] hotfix check_grad perf regression #8581

Merged
merged 4 commits into from
Jul 30, 2021
Merged

[FIX][CI] hotfix check_grad perf regression #8581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f997ba
hotfix check_grad perf regression: lift compile out of hot loop
altanh Jul 28, 2021
23d2351
hoist interpreter creation out of python closure, fix weird conv2d bu…
altanh Jul 29, 2021
0505a08
lint
altanh Jul 29, 2021
fb7ce15
try one more fix
altanh Jul 29, 2021
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: 2 additions & 1 deletion python/tvm/relay/backend/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ def _make_executor(self, expr=None):
if expr is None or isinstance(expr, GlobalVar):
assert self.mod is not None

_intrp = _backend.CreateInterpreter(self.optimize(), self.device, self.target)

def _interp_wrapper(*args, **kwargs):
if expr is None:
args = self._convert_args(self.mod["main"], args, kwargs)
Expand All @@ -253,7 +255,6 @@ def _interp_wrapper(*args, **kwargs):

mod = self.optimize()
opt_expr = Call(mod["main"], relay_args)
_intrp = _backend.CreateInterpreter(mod, self.device, self.target)
return _intrp(opt_expr)

return _interp_wrapper
5 changes: 3 additions & 2 deletions python/tvm/relay/testing/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,16 @@ def check_grad(
assert len(grads) > 0, "You must test at least one gradient."

# Get numeric gradients for each dimension of each param, using two-sided approximation.
fwd_func_compiled = intrp.evaluate(fwd_func)
approx_grads = []
for x in test_inputs:
approx_grad = np.zeros(x.shape)
for i in np.ndindex(*x.shape):
x_i = x[i]
x[i] = x_i + eps
fwd_plus = intrp.evaluate(fwd_func)(*inputs).numpy().astype("float64")
fwd_plus = fwd_func_compiled(*inputs).numpy().astype("float64")
x[i] = x_i - eps
fwd_minus = intrp.evaluate(fwd_func)(*inputs).numpy().astype("float64")
fwd_minus = fwd_func_compiled(*inputs).numpy().astype("float64")
x[i] = x_i
approx_grad[i] = np.sum((fwd_plus - fwd_minus) / (2 * eps))
approx_grads.append(approx_grad)
Expand Down
7 changes: 5 additions & 2 deletions python/tvm/topi/arm_cpu/group_conv2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ def schedule_group_conv2d_nchw(outs):
return schedule_group_conv2d_nchwc(outs)


def _get_default_config(cfg, data, kernel, strides, padding, groups, out_dtype, layout="NCHW"):
def _get_default_config(
cfg, data, kernel, strides, padding, dilation, groups, out_dtype, layout="NCHW"
):
"""
Get default schedule config for the workload
"""
Expand All @@ -54,7 +56,7 @@ def _get_default_config(cfg, data, kernel, strides, padding, groups, out_dtype,
static_data_shape.append(dim)
data = te.placeholder(static_data_shape, dtype=data.dtype)

wkl = _get_conv2d_workload(data, kernel, strides, padding, out_dtype, layout)
wkl = _get_conv2d_workload(data, kernel, strides, padding, dilation, out_dtype, layout)
_fallback_schedule(cfg, wkl)


Expand Down Expand Up @@ -158,6 +160,7 @@ def group_conv2d_nchw_spatial_pack(
),
strides,
padding,
dilation,
groups,
out_dtype,
)
Expand Down