Skip to content

Commit

Permalink
Merge branch 'DOR-658-backport' into 'release-v0.6'
Browse files Browse the repository at this point in the history
DOR-658: Backport into v0.6 branch

See merge request machine-learning/dorado!945
  • Loading branch information
malton-ont committed Apr 11, 2024
2 parents 93e1169 + 91052c2 commit 3b2c825
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
1 change: 1 addition & 0 deletions dorado/read_pipeline/read_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ SimplexReadPtr shallow_copy_read(const SimplexRead& read) {
copy->offset = read.offset;
copy->read_common.sample_rate = read.read_common.sample_rate;

copy->read_common.scaling_method = read.read_common.scaling_method;
copy->read_common.shift = read.read_common.shift;
copy->read_common.scale = read.read_common.scale;

Expand Down
23 changes: 10 additions & 13 deletions tests/RNASplitTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ TEST_CASE("2 subread split", TEST_GROUP) {
read->read_common.attributes.mux = 4;
read->read_common.attributes.start_time = "2023-08-11T02:56:14.296+00:00";
read->read_common.attributes.num_samples = 10494;
read->read_common.scaling_method = "test";

const auto signal_path = std::filesystem::path(get_data_dir("rna_split")) / "signal.tensor";
torch::load(read->read_common.raw_data, signal_path.string());
Expand All @@ -32,17 +33,13 @@ TEST_CASE("2 subread split", TEST_GROUP) {
dorado::splitter::RNAReadSplitter splitter_node(splitter_settings);

const auto split_res = splitter_node.split(std::move(read));
CHECK(split_res.size() == 2);

std::vector<uint64_t> num_samples;
for (auto &r : split_res) {
num_samples.push_back(r->read_common.attributes.num_samples);
}
CHECK(num_samples == std::vector<uint64_t>{4833, 5657});

std::vector<uint32_t> split_points;
for (auto &r : split_res) {
split_points.push_back(r->read_common.split_point);
}
CHECK(split_points == std::vector<uint32_t>{0, 4837});
REQUIRE(split_res.size() == 2);

CHECK(split_res[0]->read_common.attributes.num_samples == 4833);
CHECK(split_res[0]->read_common.split_point == 0);
CHECK(split_res[0]->read_common.scaling_method == "test");

CHECK(split_res[1]->read_common.attributes.num_samples == 5657);
CHECK(split_res[1]->read_common.split_point == 4837);
CHECK(split_res[1]->read_common.scaling_method == "test");
}

0 comments on commit 3b2c825

Please sign in to comment.