saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix DEBUG_GENERATION build (#19383)

Browse source 
### Description
Currently, ORT will fail a build when the flag DEBUG_GENERATION is set
to 1 (used to debug BeamSearch and GreedySearch) in
[console_dumper.h](3b63d85c25/onnxruntime/contrib_ops/cpu/utils/console_dumper.h (L12))
with the following error:


`onnxruntime/onnxruntime/contrib_ops/cpu/transformers/logits_processor.h:270:15:
error: ‘DumpScores’ was not declared in this scope`

This is because it is defined in `logits_processor.cc`, and a debugging
artifact was passed in an earlier PR where this function is called from
`logits_processor.h` before it is defined
[[link](3a2ab1963a/onnxruntime/contrib_ops/cpu/transformers/logits_processor.h (L270))].
Builds with the flag have been broken since that PR was merged.

This PR moves DumpScores() definition from `logits_processor.cc` to
`logits_processor.h` so that all debug statements can be used correctly
in `logits_processor.cc` and `logits_processor.h` and build succeeds
with this debug flag.

---------

Co-authored-by: Peter McAughan <petermca@microsoft.com>
This commit is contained in:
petermcaughan 2024-02-01 23:53:32 -08:00 committed by GitHub
parent b71be3c1e3
commit 09d5c1b56f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
onnxruntime/contrib_ops/cpu/transformers/logits_processor.cc
View file

@ -17,14 +17,6 @@ namespace onnxruntime {
namespace contrib {
namespace transformers {
#ifdef DEBUG_GENERATION
template <typename T>
void DumpScores(const char* name, const NextTokenScores<T>& next_token_scores) {
std::cout << name << std::endl;
ORT_UNUSED_PARAMETER(next_token_scores);
}
#endif
// Interface for all scorers for beam search or beam sample.
template <typename T>
MinLengthLogitsProcessor<T>::MinLengthLogitsProcessor(int min_length, int eos_token_id)
@ -36,10 +28,6 @@ void MinLengthLogitsProcessor<T>::Process(const ISequences* sequences,
if (sequences->GetSequenceLength() < min_length_) {
next_token_scores.SetScore(eos_token_id_, std::numeric_limits<T>::lowest());
}
#ifdef DEBUG_GENERATION
DumpScores("MinLengthLogitsProcessor", next_token_scores);
#endif
}
template <typename T>
@ -68,10 +56,6 @@ void RepetitionPenaltyLogitsProcessor<T>::Process(const ISequences* sequences,
beam_token_scores[word_id] = (score < 0 ? score * penalty_ : score / penalty_);
}
}
#ifdef DEBUG_GENERATION
DumpScores("RepetitionPenaltyLogitsProcessor", next_token_scores);
#endif
}
template <typename T>
@ -109,10 +93,6 @@ void NoRepeatNGramLogitsProcessor<T>::Process(const ISequences* sequences,
beam_token_scores[word_id] = std::numeric_limits<T>::lowest();
}
}
#ifdef DEBUG_GENERATION
DumpScores("NoRepeatNGramLogitsProcessor", next_token_scores);
#endif
}
template <typename T>
@ -136,10 +116,6 @@ void VocabMaskLogitsProcessor<T>::Process(const ISequences* /*sequences*/,
}
}
}
#ifdef DEBUG_GENERATION
DumpScores("VocabMaskLogitsProcessor", next_token_scores);
#endif
}
template <typename T>
@ -171,10 +147,6 @@ void PrefixVocabMaskLogitsProcessor<T>::Process(const ISequences* /*sequences*/,
}
}
}
#ifdef DEBUG_GENERATION
DumpScores("PrefixVocabMaskLogitsProcessor", next_token_scores);
#endif
}
template <typename T>
@ -193,10 +165,6 @@ void TemperatureLogitsProcessor<T>::Process(const ISequences* /*sequences*/,
*p /= temperature_;
++p;
}
#ifdef DEBUG_GENERATION
DumpScores("TemperatureLogitsProcessor", next_token_scores);
#endif
}
template <typename T>
@ -218,10 +186,6 @@ void PresencePenaltyLogitsProcessor<T>::Process(const ISequences*,
for (size_t i = 0; i < next_token_scores.scores.size(); i++) {
*p -= presence_mask_[i] * presence_penalty_;
}
#ifdef DEBUG_GENERATION
DumpScores("PresencePenaltyLogitsProcessor", next_token_scores);
#endif
}
void LogitsProcessorList::Init(const BeamSearchParameters& parameters) {

4
onnxruntime/contrib_ops/cpu/transformers/logits_processor.h
View file

@ -265,10 +265,6 @@ class TimestampLogitsProcessor : public ILogitsProcessor<T> {
}
}
}
#ifdef DEBUG_GENERATION
DumpScores("TimestampLogitsProcessor", next_token_scores);
#endif
}
private: