From 031c3f3c46544379976dcdfaca8d1ff85906598b Mon Sep 17 00:00:00 2001
From: zhuoyiyang <yangzhuo18@mails.tsinghua.edu.cn>
Date: Wed, 27 Oct 2021 11:41:47 +0800
Subject: [PATCH] solve conflit

---
 data_utils/configure_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data_utils/configure_data.py b/data_utils/configure_data.py
index c34c435..693c224 100755
--- a/data_utils/configure_data.py
+++ b/data_utils/configure_data.py
@@ -298,7 +298,7 @@ class BlockedRandomSplitDataset(data.Dataset):
     def __init__(self, ds, indices, block_size,**kwargs):
         if type(indices) is not np.ndarray:
             indices = np.array(indices)
-            indices = np.sort(indices)
+        indices = np.sort(indices)
         self.block_size = block_size
         self.wrapped_data = ds
         self.wrapped_data_len = len(ds)
-- 
GitLab