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

Update dynamo api and fix hip compiler error #1069

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Update dynamo api and fix hip compiler error #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
02b14f6
Merge pull request #1 from alibaba/main
zhangxiao-stack Jan 5, 2023
902b380
Merge branch 'alibaba:main' into main
zhangxiao-stack Jan 12, 2023
1c4fafd
Merge branch 'alibaba:main' into main
zhangxiao-stack Jan 12, 2023
e574b9e
fix hip d_conv launch failed
zhangxiao-stack Jan 12, 2023
0d48c62
Merge branch 'alibaba:main' into main
zhangxiao-stack Jan 18, 2023
530966d
fix hip conv fp16 performance
zhangxiao-stack Jan 18, 2023
1d2792f
Merge branch 'alibaba:main' into main
zhangxiao-stack Feb 4, 2023
da91932
Merge branch 'alibaba:main' into main
zhangxiao-stack Feb 4, 2023
0c9ff4f
Merge branch 'main' of github.com:zhangxiao-stack/BladeDISC
zhangxiao-stack Feb 4, 2023
5f7877d
Merge branch 'alibaba:main' into main
zhangxiao-stack Mar 9, 2023
e30d043
update dynamo api and fix hip compiler error
zhangxiao-stack Mar 9, 2023
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
18 changes: 7 additions & 11 deletions pytorch_blade/torch_blade/dynamo/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

import torch_blade.dynamo.patch_user_defined

from torch._dynamo.optimizations.training import aot_autograd
from torch._dynamo.optimizations.backends import BACKENDS, create_backend
from torch._dynamo.optimizations.subgraph import SubGraph
from torch._dynamo.backends.common import aot_autograd
from torch._dynamo.backends.registry import register_backend
from torch._functorch import compilers
from torch._dynamo.utils import torchscript
from functorch.compile import min_cut_rematerialization_partition

import torch
Expand Down Expand Up @@ -85,14 +85,13 @@ def _disc_compile(fx_g: fx.GraphModule, inps, use_ts=False, is_training=True) ->

return f

@compilers.make_boxed_compiler
def disc_compile(fx_g: fx.GraphModule, inps, use_ts=False) -> Callable:
return _disc_compile(fx_g, inps, use_ts=False)

def disc(fx_g: fx.GraphModule, inps) -> Callable:
import tempfile
with tempfile.TemporaryDirectory() as tmp:
scripted = SubGraph(fx_g, inps, tmp).scripted
scripted = torchscript(fx_g, inps)
torch._C._jit_pass_remove_mutation(scripted.graph)
f = torch.jit.freeze(scripted.eval())
cfg = torch_blade.Config()
Expand All @@ -101,7 +100,6 @@ def disc(fx_g: fx.GraphModule, inps) -> Callable:
f = torch_blade.optimize(f, True, tuple(inps))
return f

@compilers.make_boxed_compiler
def disc_compile_ts(fx_g: fx.GraphModule, inps, use_ts=False) -> Callable:
return _disc_compile(fx_g, inps, use_ts=True)

Expand Down Expand Up @@ -194,7 +192,6 @@ def _get_disc_decomp():
]
)
return decompositions_dict

aot_disc = aot_autograd(
# these are taken from memory_efficient_fusion()
fw_compiler=disc_compile,
Expand All @@ -203,7 +200,6 @@ def _get_disc_decomp():
decompositions=_get_disc_decomp(),
partition_fn=min_cut_rematerialization_partition)


aot_disc_debug = aot_autograd(
# these are taken from memory_efficient_fusion()
fw_compiler=disc_compile_ts,
Expand All @@ -212,6 +208,6 @@ def _get_disc_decomp():
decompositions=_get_disc_decomp(),
partition_fn=min_cut_rematerialization_partition)

BACKENDS["disc"] = disc
BACKENDS["aot_disc"] = aot_disc
BACKENDS["aot_disc_debug"] = aot_disc_debug
register_backend(name="disc", compiler_fn=disc)
register_backend(name="aot_disc", compiler_fn=aot_disc)
register_backend(name="aot_disc_debug", compiler_fn=aot_disc_debug)
8 changes: 4 additions & 4 deletions tao_compiler/mlir/xla/ral/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ cc_library(
"@local_config_cuda//cuda:cuda_driver",
"@local_config_cuda//cuda:cuda_headers",
]) + if_rocm_is_configured([
"@org_tensorflow//tensorflow/stream_executor:rocm_platform",
"@org_tensorflow//tensorflow/compiler/xla/stream_executor/rocm:all_runtime",
"@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
"@local_config_rocm//rocm:rocm_headers",
]) + if_cuda_or_rocm([
Expand Down Expand Up @@ -370,7 +370,7 @@ tf_gpu_library(
] + if_cuda_is_configured([
"@local_config_cuda//cuda:cuda_driver",
]) + if_rocm_is_configured([
"//tensorflow/stream_executor/rocm:rocm_driver",
"@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
]),
alwayslink = 1,
)
Expand Down Expand Up @@ -429,7 +429,7 @@ cc_library(
"@local_config_cuda//cuda:cuda_driver",
"@local_config_cuda//cuda:cuda_headers",
]) + if_rocm_is_configured([
"@org_tensorflow//tensorflow/stream_executor:rocm_platform",
"@org_tensorflow//tensorflow/compiler/xla/stream_executor/rocm:all_runtime",
"@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
"@local_config_rocm//rocm:rocm_headers",
]),
Expand Down Expand Up @@ -485,7 +485,7 @@ cc_library(
"@local_config_cuda//cuda:cuda_driver",
"@local_config_cuda//cuda:cuda_headers",
]) + if_rocm_is_configured([
"@org_tensorflow//tensorflow/stream_executor:rocm_platform",
"@org_tensorflow//tensorflow/compiler/xla/stream_executor/rocm:all_runtime",
"@org_tensorflow//tensorflow/stream_executor/rocm:rocm_driver",
"@local_config_rocm//rocm:rocm_headers",
]),
Expand Down