From 44f4aa5f66cafe802a95af4d35fa0132dbddf81a Mon Sep 17 00:00:00 2001 From: Daniel Povey Date: Fri, 13 May 2022 11:32:23 +0800 Subject: [PATCH] Try to resolve merge issues etc --- egs/librispeech/ASR/pruned2_knowledge/sampling.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/egs/librispeech/ASR/pruned2_knowledge/sampling.py b/egs/librispeech/ASR/pruned2_knowledge/sampling.py index 4871e5981..7b05e2f00 100644 --- a/egs/librispeech/ASR/pruned2_knowledge/sampling.py +++ b/egs/librispeech/ASR/pruned2_knowledge/sampling.py @@ -214,9 +214,9 @@ class KnowledgeBaseLookup(nn.Module): x = x.reshape(*x.shape[:-1], self.N, self.M) # now (*, N, M) x = x.log_softmax(dim=-1) # now normalized logprobs, dim= (*, N, M) x = PenalizeNegentropyFunction.apply(x, self.negentropy_penalty) - weights, indexes, = sample_combined(x, self.K, input_is_log=True) - indexes = join_indexes(indexes, self.M) - x = WeightedMatrixLookupFunction.apply(weights, indexes, self.knowledge_base) # now (*, D) + + _, indexes, weights = sample_combined(x, self.K, input_is_log=True) + x = weighted_matrix_lookup(weights, indexes, self.knowledge_base) # now (*, D) x = self.out_proj(x) # now (*, self.embedding_dim) return x