saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-21 19:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Scan 8 bug where the sequence length was > 2 (#580) (#597)

Browse source
This commit is contained in:
Randy 2019-03-12 09:47:40 -07:00 committed by Pranav Sharma
parent 44cb4c4f74
commit 17ceca260a
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
onnxruntime/core/providers/cpu/controlflow/scan_8.cc
View file

@ -425,8 +425,10 @@ Status Scan8Impl::Execute(FeedsFetchesManager* ffm, const FeedsFetchesManager* c
implicit_inputs_, output_iterators_, ffm, cached_ffm);
// use the cached info from now on
cached_ffm = ffm;
ffm = nullptr;
if (ffm) {
cached_ffm = ffm;
ffm = nullptr;
}
// zero out any remaining values in the sequence
for (int64_t i = sequence_len; i < max_sequence_len_; ++i) {

26
onnxruntime/test/providers/cpu/controlflow/scan_test.cc
View file

@ -604,39 +604,45 @@ TEST(Scan8, ShortSequenceTwoInBatchOneLoopStateVar) {
}
TEST(Scan8, MixedSequenceLens) {
const int64_t batch_size = 2;
const int64_t batch_size = 3;
const int64_t max_sequence_len = 2;
const int64_t input_size = 2;
std::vector<int64_t> sequence_lens{1, 2};
std::vector<int64_t> sequence_lens{1, 2, 2};
std::vector<float> iteration_count_in{0.f, 10.f}; // start at 0 for first item in batch, and 10 for second
std::vector<float> iteration_count_in{0.f, 10.f, 1.f}; // start at 0 for first item in batch, and 10 for second
// batch_size, max_sequence_len, input_size
std::vector<float> input_0{1.f, 2.f,
4.f, 3.f, // <- this should be ignored
-1.f, -2.f,
-4.f, -3.f};
-4.f, -3.f,
10.f, 11.f,
12.f, 13.f};
std::vector<float> input_1{3.f, 4.f,
2.f, 1.f, // <- this should be ignored
-3.f, -4.f,
-2.f, -1.f};
-2.f, -1.f,
22.f, 33.f,
44.f, 55.f};
// iteration_count_in + 1 for each item in sequence.
// as sequence_len is 1 for the first item in the batch, the final value should be 0 + 1.
// as sequence_len is 2 for the second item in the batch, the final value should be 10 + 1 + 1.
std::vector<float> iteration_count_out{1.f, 12.f};
std::vector<float> iteration_count_out{1.f, 12.f, 3.f};
// batch_size, max_sequence_len, 1
// as sequence_len is 1 for the first item in the batch we expect 0.f's for the second value in the output
// (which technically is undefined, but 0.f is consistent with other RNN ops)
std::vector<float> output_0{1.f, 0.f, -1.f, -4.f};
std::vector<float> output_1{2.f, 0.f, -2.f, -3.f};
std::vector<float> output_2{3.f, 0.f, -3.f, -2.f};
std::vector<float> output_3{4.f, 0.f, -4.f, -1.f};
std::vector<float> output_0{1.f, 0.f, -1.f, -4.f, 10.f, 12.f};
std::vector<float> output_1{2.f, 0.f, -2.f, -3.f, 11.f, 13.f};
std::vector<float> output_2{3.f, 0.f, -3.f, -2.f, 22.f, 44.f};
std::vector<float> output_3{4.f, 0.f, -4.f, -1.f, 33.f, 55.f};
RunTest_v8("MixedSequenceLens", batch_size, max_sequence_len, input_size,
nullptr, &sequence_lens,