Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[mkldnn-v1.0]make MKLDNN macro simple for imperative_utils.h #16652

Merged
merged 1 commit into from
Oct 28, 2019
Merged

[mkldnn-v1.0]make MKLDNN macro simple for imperative_utils.h #16652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/imperative/imperative_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,10 +484,10 @@ inline void PushFComputeEx(const FComputeEx& fn,
CreateDefaultInputs(inputs, &inputs_fallback);
fn(attrs, opctx, inputs_fallback, req, outputs);
} else {
#endif
fn(attrs, opctx, inputs, req, outputs);
#if MXNET_USE_MKLDNN == 1
}
#else
fn(attrs, opctx, inputs, req, outputs);
#endif
if (ctx.dev_mask() == gpu::kDevMask && exec_type == ExecType::kSync && !rctx.is_bulk) {
rctx.get_stream<gpu>()->Wait();
Expand Down Expand Up @@ -548,10 +548,10 @@ inline void PushOperator(const OpStatePtr& state,
CreateDefaultInputs(inputs, &inputs_fallback);
fcompute_ex(state, opctx, inputs_fallback, req, outputs);
} else {
#endif
fcompute_ex(state, opctx, inputs, req, outputs);
#if MXNET_USE_MKLDNN == 1
}
#else
fcompute_ex(state, opctx, inputs, req, outputs);
#endif
if (ctx.dev_mask() == gpu::kDevMask && exec_type == ExecType::kSync
&& rctx.get_stream<gpu>() && !rctx.is_bulk) {
Expand Down