Fixed failing test cases (c551be55) · Commits · 钟慕尧 / deepchem

deepchem/data/data_loader.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ from deepchem.utils.save import load_sdf_files
		from deepchem.utils.genomics import encode_fasta_sequence
		from deepchem.feat import UserDefinedFeaturizer
		from deepchem.data import DiskDataset, NumpyDataset, ImageDataset
		from scipy import misc
		import zipfile
		from PIL import Image

		@@ -413,7 +412,7 @@ class ImageLoader(DataLoader):
		_, extension = os.path.splitext(image_file)
		extension = extension.lower()
		if extension == ".png":
		image = misc.imread(image_file)
		image = np.array(Image.open(image_file))
		images.append(image)
		elif extension == ".tif":
		im = Image.open(image_file)

+5 −4

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ import os
		import unittest
		import tempfile
		from scipy import misc
		from PIL import Image
		import deepchem as dc
		import zipfile

		@@ -26,9 +27,9 @@ class TestImageLoader(unittest.TestCase):
		self.data_dir = tempfile.mkdtemp()
		self.face = misc.face()
		self.face_path = os.path.join(self.data_dir, "face.png")
		misc.imsave(self.face_path, self.face)
		Image.fromarray(self.face).save(self.face_path)
		self.face_copy_path = os.path.join(self.data_dir, "face_copy.png")
		misc.imsave(self.face_copy_path, self.face)
		Image.fromarray(self.face).save(self.face_copy_path)

		# Create zip of image file
		#self.zip_path = "/home/rbharath/misc/cells.zip"
		@@ -54,9 +55,9 @@ class TestImageLoader(unittest.TestCase):
		# Create image directory
		self.image_dir = tempfile.mkdtemp()
		face_path = os.path.join(self.image_dir, "face.png")
		misc.imsave(face_path, self.face)
		Image.fromarray(self.face).save(face_path)
		face_copy_path = os.path.join(self.image_dir, "face_copy.png")
		misc.imsave(face_copy_path, self.face)
		Image.fromarray(self.face).save(face_copy_path)

		def test_png_simple_load(self):
		loader = dc.data.ImageLoader()

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ def load_clintox(featurizer='ECFP',
		"""Load clintox datasets."""
		if data_dir is None:
		data_dir = DEFAULT_DIR
		else:
		if save_dir is None:
		save_dir = DEFAULT_DIR

		if reload: