cell-data-loader 0.0.32__tar.gz → 0.0.33__tar.gz

{cell_data_loader-0.0.32 → cell_data_loader-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cell_data_loader
-Version: 0.0.32
+Version: 0.0.33
 Summary: Converts general images of cells into formats and labels for deep learning pipelines
 Project-URL: Homepage, https://github.com/mleming/CellDataLoader
 Author-email: Matt Leming <mleming@mgh.harvard.edu>

{cell_data_loader-0.0.32 → cell_data_loader-0.0.33}/pyproject.toml

@@ -2,7 +2,7 @@
 
 name = "cell_data_loader"
 
-version = "0.0.32"
+version = "0.0.33"
 
 dependencies = [
   "numpy>=1.22.0",

{cell_data_loader-0.0.32 → cell_data_loader-0.0.33}/src/cell_data_loader/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.0.32"
+__version__ = "0.0.33"
 
 from .cell_data_loader import *

{cell_data_loader-0.0.32 → cell_data_loader-0.0.33}/src/cell_data_loader/cell_data_loader.py

@@ -594,8 +594,8 @@ class CellDataloader():#BaseDataset):
 				out_file_name = os.path.join(self.sample_output_folder,
 					"%.8d" % self.imcount)
 				if self.return_labels():
-					out_file_name = "%s_%s" % (out_file_name,
-												str(self.label_batch[i]))
+					out_file_name = "%s_%d" % (out_file_name,
+										int(np.argmax(self.label_batch[i])))
 				if self.return_filenames:
 					out_file_name = "%s_%s" % (out_file_name,
 						os.path.basename(os.path.splitext(fnames[i])[0]))
@@ -612,7 +612,7 @@ class CellDataloader():#BaseDataset):
 				im = im * 255
 				im = im.astype(np.uint8)
 				Image.fromarray(im).save(out_file_name)
-				
+				del im
 		if self.return_labels():
 			r.append(self.label_batch)
 		if self.return_filenames:

{cell_data_loader-0.0.32 → cell_data_loader-0.0.33}/tests/unit_tests.py

@@ -65,11 +65,15 @@ class TestSimple(unittest.TestCase):
 			break
 	
 	def test_sample_outputs(self):
-		dataset = CellDataloader(imfolder1,sample_output_folder="sample")
-		self.assertTrue(os.path.isdir("sample"))
-		for xy in dataset:
-			break
-		assert len(glob.glob(os.path.join("sample","*.png"))) > 1
+		for k in ["whole","sliced","cell"]:
+			dataset = CellDataloader(imfolder1,imfolder2,
+				sample_output_folder="sample_%s" % k,
+				normalize=False,augment_image=False,segment_image=k)
+			self.assertTrue(os.path.isdir("sample_%s" % k))
+			for xy in dataset:
+				continue
+			assert len(glob.glob(os.path.join("sample_%s" % k,"*.png"))) > 1
+
 	def test_different_folder_inputs(self):
 		dataset = CellDataloader(imfolder1,verbose=False)
 		self.assertEqual(dataset.label_input_format,"None")