From 57e023e5cfa522007e24d87c8e3d82bf7c4a19cd Mon Sep 17 00:00:00 2001
From: Shi Xian <40013335+R1ckShi@users.noreply.github.com>
Date: 星期二, 18 二月 2025 15:15:40 +0800
Subject: [PATCH] Merge pull request #2382 from msgk239/dev_clean
---
funasr/datasets/audio_datasets/samplers.py | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/funasr/datasets/audio_datasets/samplers.py b/funasr/datasets/audio_datasets/samplers.py
index 94e9209..f7057de 100644
--- a/funasr/datasets/audio_datasets/samplers.py
+++ b/funasr/datasets/audio_datasets/samplers.py
@@ -392,17 +392,14 @@
)
batch = []
max_len_in_batch = 0
- count = 0
+ count = 1
for idx in buffer:
original_sample_length = self.dataset.get_source_len(idx)
if original_sample_length > self.max_token_length:
continue
sample_length = 1 if self.batch_type == "example" else original_sample_length
potential_batch_length = max(max_len_in_batch, sample_length) * (len(batch) + 1)
- if (
- potential_batch_length <= self.batch_size
- and count <= self.batch_size_sample_max
- ):
+ if potential_batch_length <= self.batch_size and count < self.batch_size_sample_max:
batch.append(idx)
max_len_in_batch = max(max_len_in_batch, sample_length)
count += 1
@@ -410,7 +407,7 @@
buffer_batches.append(batch)
batch = [idx]
max_len_in_batch = sample_length
- count = 0
+ count = 1
if batch:
buffer_batches.append(batch)
@@ -431,7 +428,7 @@
self.batch_num = len(final_batches)
logging.info(
- f"rank: {self.rank}, dataloader start from step: {self.start_step}, batch_num: {rank_batches[self.rank]}, after: {self.batch_num}"
+ f"rank: {self.rank}, dataloader start from step: {self.start_step}, batch_num: {len(rank_batches[self.rank])}, after: {self.batch_num}"
)
return iter(final_batches)
--
Gitblit v1.9.1