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

UserKernel init CUDA Graphs with state #6230

Merged
merged 3 commits into from
Sep 10, 2021
Merged

UserKernel init CUDA Graphs with state #6230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71b8da2
UserKernel init CUDA Graphs with state
liujuncheng Sep 10, 2021
4027107
Merge branch 'master' into dev_cuda_graph_kernel_state
liujuncheng Sep 10, 2021
9d53f24
Merge branch 'master' into dev_cuda_graph_kernel_state
oneflow-ci-bot Sep 10, 2021
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
5 changes: 4 additions & 1 deletion oneflow/core/kernel/cuda_graph_support.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ namespace oneflow {
namespace user_op {

class KernelInitContext;
class OpKernelState;

class CudaGraphSupport {
public:
CudaGraphSupport() = default;
virtual ~CudaGraphSupport() = default;

virtual bool IsCudaGraphSupported(KernelInitContext* ctx) const { return true; }
virtual bool IsCudaGraphSupported(KernelInitContext* ctx, OpKernelState* state) const {
return true;
}
};

} // namespace user_op
Expand Down
36 changes: 18 additions & 18 deletions oneflow/core/kernel/user_kernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,24 +603,6 @@ void UserKernel::InitUserKernel(StreamContext* stream_ctx, DeviceCtx* device_ctx
KernelCreateContext create_ctx(kernel_conf());
kernel_.reset(kernel_reg_val->create_fn(&create_ctx));
}

#ifdef WITH_CUDA_GRAPHS
if (ParseBooleanFromEnv("ONEFLOW_KERNEL_ENABLE_CUDA_GRAPH", false)) {
UserKernelInitContext init_ctx(device_ctx, kernel_conf());
cuda_graph_ctx_ = dynamic_cast<CudaGraphContext*>(stream_ctx);
const auto* cuda_graph_support = dynamic_cast<const user_op::CudaGraphSupport*>(kernel_.get());
if (cuda_graph_ctx_ != nullptr) {
if (cuda_graph_support != nullptr && cuda_graph_support->IsCudaGraphSupported(&init_ctx)) {
cuda_graph_exec_.reset(new CudaGraphExecutable());
LOG(INFO) << "CUDA Graphs Kernel: " << op_conf().name() << " ("
<< op_conf().user_conf().op_type_name() << ")";
} else {
LOG(INFO) << "CUDA Graphs not supported: " << op_conf().name() << " ("
<< op_conf().user_conf().op_type_name() << ")";
}
}
}
#endif // WITH_CUDA_GRAPHS
}

std::shared_ptr<user_op::OpKernelState> UserKernel::CreateOpKernelState(DeviceCtx* device_ctx) {
Expand Down Expand Up @@ -672,6 +654,24 @@ void UserKernel::VirtualKernelInit(KernelContext* ctx) {
InitUserKernel(ctx->stream_ctx(), ctx->device_ctx());
CHECK(opkernel_state_.get() == nullptr);
opkernel_state_ = CreateOpKernelState(ctx->device_ctx());
#ifdef WITH_CUDA_GRAPHS
if (ParseBooleanFromEnv("ONEFLOW_KERNEL_ENABLE_CUDA_GRAPH", false)) {
UserKernelInitContext init_ctx(ctx->device_ctx(), kernel_conf());
cuda_graph_ctx_ = dynamic_cast<CudaGraphContext*>(ctx->stream_ctx());
const auto* cuda_graph_support = dynamic_cast<const user_op::CudaGraphSupport*>(kernel_.get());
if (cuda_graph_ctx_ != nullptr) {
if (cuda_graph_support != nullptr
&& cuda_graph_support->IsCudaGraphSupported(&init_ctx, opkernel_state_.get())) {
cuda_graph_exec_.reset(new CudaGraphExecutable());
LOG(INFO) << "CUDA Graphs Kernel: " << op_conf().name() << " ("
<< op_conf().user_conf().op_type_name() << ")";
} else {
LOG(INFO) << "CUDA Graphs not supported: " << op_conf().name() << " ("
<< op_conf().user_conf().op_type_name() << ")";
}
}
}
#endif // WITH_CUDA_GRAPHS
}

void UserKernel::ForwardDataContent(KernelContext* ctx) const {
Expand Down
9 changes: 6 additions & 3 deletions oneflow/user/kernels/conv_cudnn_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ class ConvGpuKernel final : public user_op::OpKernel, public user_op::CudaGraphS
}
}

bool IsCudaGraphSupported(user_op::KernelInitContext* ctx) const override {
bool IsCudaGraphSupported(user_op::KernelInitContext* ctx,
user_op::OpKernelState* state) const override {
return Global<ResourceDesc, ForSession>::Get()
->resource()
.cudnn_conf()
Expand Down Expand Up @@ -270,7 +271,8 @@ class ConvDataGradGpuKernel final : public user_op::OpKernel, public user_op::Cu
args.params.max_ws_size, beta, args.xdesc.Get(), dx->mut_dptr()));
}

bool IsCudaGraphSupported(user_op::KernelInitContext* ctx) const override {
bool IsCudaGraphSupported(user_op::KernelInitContext* ctx,
user_op::OpKernelState* state) const override {
return Global<ResourceDesc, ForSession>::Get()
->resource()
.cudnn_conf()
Expand Down Expand Up @@ -334,7 +336,8 @@ class ConvFilterGradGpuKernel final : public user_op::OpKernel, public user_op::
args.params.max_ws_size, CudnnSPZeroPtr<T>(), args.wdesc.Get(), filter_diff->mut_dptr()));
}

bool IsCudaGraphSupported(user_op::KernelInitContext* ctx) const override {
bool IsCudaGraphSupported(user_op::KernelInitContext* ctx,
user_op::OpKernelState* state) const override {
return Global<ResourceDesc, ForSession>::Get()
->resource()
.cudnn_conf()
Expand Down