From afa0d82e34862b9fc494d1ebf0c18d2ac98b32a3 Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Sat, 4 Jun 2022 11:10:18 -0500
Subject: [PATCH] minor...
---
modules/deeplearning/unet_l1b_l2.py | 60 ++++++++++++++---------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/modules/deeplearning/unet_l1b_l2.py b/modules/deeplearning/unet_l1b_l2.py
index f6460669..e94fd5ff 100644
--- a/modules/deeplearning/unet_l1b_l2.py
+++ b/modules/deeplearning/unet_l1b_l2.py
@@ -342,35 +342,35 @@ class UNET:
dataset = dataset.map(self.data_function_evaluate, num_parallel_calls=8)
self.eval_dataset = dataset
- def setup_pipeline(self, data_nda, label_nda, perc=0.20):
-
- num_samples = data_nda.shape[0]
- num_test = int(num_samples * perc)
- self.num_data_samples = num_samples - num_test
- num_train = self.num_data_samples
-
- self.train_data_nda = data_nda[0:num_train]
- self.train_label_nda = label_nda[0:num_train]
- self.test_data_nda = data_nda[num_train:]
- self.test_label_nda = label_nda[num_train:]
-
- trn_idxs = np.arange(self.train_data_nda.shape[0])
- tst_idxs = np.arange(self.test_data_nda.shape[0])
-
- np.random.shuffle(tst_idxs)
-
- self.get_train_dataset(trn_idxs)
- self.get_test_dataset(tst_idxs)
-
- print('datetime: ', now)
- print('training and test data: ')
- print('---------------------------')
- print('num train samples: ', self.num_data_samples)
- print('BATCH SIZE: ', BATCH_SIZE)
- print('num test samples: ', tst_idxs.shape[0])
- print('setup_pipeline: Done')
-
- def setup_pipeline_files(self, train_data_files, train_label_files, test_data_files, test_label_files):
+ # def setup_pipeline(self, data_nda, label_nda, perc=0.20):
+ #
+ # num_samples = data_nda.shape[0]
+ # num_test = int(num_samples * perc)
+ # self.num_data_samples = num_samples - num_test
+ # num_train = self.num_data_samples
+ #
+ # self.train_data_nda = data_nda[0:num_train]
+ # self.train_label_nda = label_nda[0:num_train]
+ # self.test_data_nda = data_nda[num_train:]
+ # self.test_label_nda = label_nda[num_train:]
+ #
+ # trn_idxs = np.arange(self.train_data_nda.shape[0])
+ # tst_idxs = np.arange(self.test_data_nda.shape[0])
+ #
+ # np.random.shuffle(tst_idxs)
+ #
+ # self.get_train_dataset(trn_idxs)
+ # self.get_test_dataset(tst_idxs)
+ #
+ # print('datetime: ', now)
+ # print('training and test data: ')
+ # print('---------------------------')
+ # print('num train samples: ', self.num_data_samples)
+ # print('BATCH SIZE: ', BATCH_SIZE)
+ # print('num test samples: ', tst_idxs.shape[0])
+ # print('setup_pipeline: Done')
+
+ def setup_pipeline(self, train_data_files, train_label_files, test_data_files, test_label_files):
self.train_data_files = train_data_files
self.train_label_files = train_label_files
@@ -898,7 +898,7 @@ class UNET:
train_label_files.sort()
valid_label_files.sort()
- self.setup_pipeline_files(train_data_files, train_label_files, valid_data_files, valid_label_files)
+ self.setup_pipeline(train_data_files, train_label_files, valid_data_files, valid_label_files)
self.build_model()
self.build_training()
self.build_evaluation()
--
GitLab