From 3d5e19792cd4bb510c2c0fc5749731d52b825c15 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期六, 08 六月 2024 18:43:35 +0800
Subject: [PATCH] fix bug
---
funasr/datasets/audio_datasets/samplers.py | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/funasr/datasets/audio_datasets/samplers.py b/funasr/datasets/audio_datasets/samplers.py
index 7195add..2e271af 100644
--- a/funasr/datasets/audio_datasets/samplers.py
+++ b/funasr/datasets/audio_datasets/samplers.py
@@ -365,6 +365,7 @@
self.max_token_length = kwargs.get("max_token_length", 2048)
self.length_scale_source = kwargs.get("length_scale_source", 1.0)
self.start_step = kwargs.get("start_step", 2048)
+ self.batch_size_sample_max = kwargs.get("batch_size_sample_max", 200)
super().__init__(
dataset, num_replicas=num_replicas, rank=rank, shuffle=shuffle, drop_last=drop_last
@@ -388,19 +389,25 @@
)
batch = []
max_len_in_batch = 0
+ count = 0
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:
+ 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
else:
buffer_batches.append(batch)
batch = [idx]
max_len_in_batch = sample_length
+ count = 0
if batch:
buffer_batches.append(batch)
@@ -417,7 +424,7 @@
rank_batches[i % self.num_replicas].append(batch)
# Assign all batches for the current rank directly
- final_batches = rank_batches[self.rank][self.start_step :]
+ final_batches = rank_batches[self.rank] # [self.start_step :]
self.batch_num = len(final_batches)
logging.info(
--
Gitblit v1.9.1