From 87db37edd766156814ebbdcf22bf087e1d5469d2 Mon Sep 17 00:00:00 2001 From: binbinHan Date: Tue, 4 Sep 2018 17:33:46 +0800 Subject: [PATCH] Dev hinge loss (#1207) * add hinge loss * add hinge loss test * hack hinge loss * optimize hinge loss * optimize hinge loss * optimize hinge loss * optimize hinge loss --- oneflow/core/kernel/hinge_loss_kernel.cpp | 4 ---- oneflow/core/kernel/hinge_loss_kernel.cu | 4 ---- oneflow/core/operator/op_conf.proto | 1 + 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/oneflow/core/kernel/hinge_loss_kernel.cpp b/oneflow/core/kernel/hinge_loss_kernel.cpp index af27c7190c..1f16de3436 100644 --- a/oneflow/core/kernel/hinge_loss_kernel.cpp +++ b/oneflow/core/kernel/hinge_loss_kernel.cpp @@ -57,10 +57,6 @@ struct HingeLossKernelUtil { KernelUtil::Mul(ctx, piece_size * pre_dim, tmp_diff, tmp_diff, tmp); KernelUtil::RowSum(ctx, piece_size, pre_dim, tmp, loss); - /*for (int64_t i = 0; i < piece_size; ++i) { - KernelUtil::Dot(ctx, pre_dim, tmp_diff + i * pre_dim, 1, - tmp_diff + i * pre_dim, 1, loss + i); - }*/ break; default: LOG(FATAL) << "Invalid norm method in " << op_conf.name(); } diff --git a/oneflow/core/kernel/hinge_loss_kernel.cu b/oneflow/core/kernel/hinge_loss_kernel.cu index 74cb90b113..d187363149 100644 --- a/oneflow/core/kernel/hinge_loss_kernel.cu +++ b/oneflow/core/kernel/hinge_loss_kernel.cu @@ -63,10 +63,6 @@ struct HingeLossKernelUtil { KernelUtil::RowSum(ctx, piece_size, pre_dim, tmp, loss, tmp_storage, sizeof(PredType) * piece_size * pre_dim); - /*for (int64_t i = 0; i < piece_size; ++i) { - KernelUtil::Dot(ctx, pre_dim, tmp_diff + i * pre_dim, 1, - tmp_diff + i * pre_dim, 1, loss + i); - }*/ break; default: LOG(FATAL) << "Invalid norm method in " << op_conf.name(); } diff --git a/oneflow/core/operator/op_conf.proto b/oneflow/core/operator/op_conf.proto index 1dfd084efa..ad2887499a 100644 --- a/oneflow/core/operator/op_conf.proto +++ b/oneflow/core/operator/op_conf.proto @@ -629,6 +629,7 @@ message MultiplyOpConf { required string in_1 = 2; required string out = 4; } + enum Norm { L1 = 1; L2 = 2; -- GitLab