From 98a83cd28044036b726344edccc4d20b4b4e7b36 Mon Sep 17 00:00:00 2001 From: caoying03 Date: Mon, 7 Aug 2017 18:43:30 +0800 Subject: [PATCH] follow comments. --- paddle/gserver/layers/KmaxSeqScoreLayer.cpp | 14 ++++---------- python/paddle/trainer_config_helpers/layers.py | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/paddle/gserver/layers/KmaxSeqScoreLayer.cpp b/paddle/gserver/layers/KmaxSeqScoreLayer.cpp index 8ce591d476..97e980db21 100644 --- a/paddle/gserver/layers/KmaxSeqScoreLayer.cpp +++ b/paddle/gserver/layers/KmaxSeqScoreLayer.cpp @@ -97,19 +97,13 @@ void KmaxSeqScoreLayer::forward(PassType passType) { scores_ = inputScore; } - Matrix::resizeOrCreate( - output_.value, - input.hasSubseq() ? input.getNumSubSequences() : input.getNumSequences(), - beamSize_, - false, - false); + int seqNum = + input.hasSubseq() ? input.getNumSubSequences() : input.getNumSequences(); + Matrix::resizeOrCreate(output_.value, seqNum, beamSize_, false, false); output_.value->one(); output_.value->mulScalar(-1.); - kmaxScorePerSeq(scores_->getData(), - output_.value->getData(), - input.hasSubseq() ? input.subSequenceStartPositions - : input.sequenceStartPositions); + kmaxScorePerSeq(scores_->getData(), output_.value->getData(), seqNum); } void KmaxSeqScoreLayer::backward(const UpdateCallback& callback) {} diff --git a/python/paddle/trainer_config_helpers/layers.py b/python/paddle/trainer_config_helpers/layers.py index 085ad8658b..572d6f6949 100755 --- a/python/paddle/trainer_config_helpers/layers.py +++ b/python/paddle/trainer_config_helpers/layers.py @@ -6129,7 +6129,7 @@ def clip_layer(input, min, max, name=None): @layer_support() def kmax_sequence_score_layer(input, name=None, beam_size=1): """ - This layer accepts one input which is scores over a sequence or a nested + This layer accepts one input which are scores over a sequence or a nested sequence, and returns indices of beam_size sequences with highest scores. .. code-block:: python @@ -6139,7 +6139,7 @@ def kmax_sequence_score_layer(input, name=None, beam_size=1): :param name: The Layer Name. :type name: basestring - :param input: The input layer. It is scores over a sequence or a nested + :param input: The input layer. It stores scores over a sequence or a nested sequence and its size must be 1. :type input: LayerOutput. :param beam_size: squence indices with top beam_size scores are returned.