Merge pull request #15351 from wopeizl/fixbuildissue

disable the parallel mode for adam op on windows test=develop
recover_files
wopeizl 6 years ago committed by GitHub
commit 994e73f685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -486,9 +486,11 @@ class AdamOpKernel : public framework::OpKernel<T> {
functor.adam_update(i, grad_data[row_index * row_numel + offset]); functor.adam_update(i, grad_data[row_index * row_numel + offset]);
} }
} }
} else if (FLAGS_inner_op_parallelism > 1 && }
min_row_size_to_use_multithread > 0 && #ifndef _WIN32
param.dims()[0] > min_row_size_to_use_multithread) { else if (FLAGS_inner_op_parallelism > 1 &&
min_row_size_to_use_multithread > 0 &&
param.dims()[0] > min_row_size_to_use_multithread) {
VLOG(3) << "use multi thread, inner_op_parallelism=" VLOG(3) << "use multi thread, inner_op_parallelism="
<< FLAGS_inner_op_parallelism << FLAGS_inner_op_parallelism
<< " min_row_size_to_use_multithread=" << " min_row_size_to_use_multithread="
@ -542,7 +544,9 @@ class AdamOpKernel : public framework::OpKernel<T> {
})); }));
} }
for (size_t i = 0; i < fs.size(); ++i) fs[i].wait(); for (size_t i = 0; i < fs.size(); ++i) fs[i].wait();
} else { }
#endif // !_WIN32
else {
functor(param.numel()); functor(param.numel());
} }
} else if (platform::is_gpu_place(ctx.GetPlace())) { } else if (platform::is_gpu_place(ctx.GetPlace())) {

Loading…
Cancel
Save