Fix tests (571336d3) · Commits · 钟慕尧 / deepchem

deepchem/dock/tests/test_binding_pocket.py

+0 −29

Original line number	Diff line number	Diff line
		@@ -149,35 +149,6 @@ class TestBindingPocket(unittest.TestCase):

		assert len(pockets) < len(all_pockets)

		def test_rf_convex_find_pockets(self):
		"""Test that filter with pre-trained RF models works."""
		if sys.version_info >= (3, 0):
		return

		current_dir = os.path.dirname(os.path.realpath(__file__))
		protein_file = os.path.join(current_dir, "1jld_protein.pdb")
		ligand_file = os.path.join(current_dir, "1jld_ligand.sdf")

		protein = md.load(protein_file)

		finder = dc.dock.RFConvexHullPocketFinder()
		pockets, pocket_atoms_map, pocket_coords = finder.find_pockets(protein_file,
		ligand_file)
		# Test that every atom in pocket maps exists
		n_protein_atoms = protein.xyz.shape[1]
		print("protein.xyz.shape")
		print(protein.xyz.shape)
		print("n_protein_atoms")
		print(n_protein_atoms)
		print("len(pockets)")
		print(len(pockets))
		for pocket in pockets:
		pocket_atoms = pocket_atoms_map[pocket]
		for atom in pocket_atoms:
		# Check that the atoms is actually in protein
		assert atom >= 0
		assert atom < n_protein_atoms

		def test_extract_active_site(self):
		"""Test that computed pockets have strong overlap with true binding pocket."""
		current_dir = os.path.dirname(os.path.realpath(__file__))

deepchem/dock/tests/test_docking.py

+0 −19

Original line number	Diff line number	Diff line
		@@ -82,25 +82,6 @@ class TestDocking(unittest.TestCase):
		# Check returned files exist
		assert score.shape == (1,)

		def test_pocket_vina_grid_rf_docker_dock(self):
		"""Test that VinaGridRFDocker can dock."""
		if sys.version_info >= (3, 0):
		return

		current_dir = os.path.dirname(os.path.realpath(__file__))
		protein_file = os.path.join(current_dir, "1jld_protein.pdb")
		ligand_file = os.path.join(current_dir, "1jld_ligand.sdf")

		docker = dc.dock.VinaGridRFDocker(exhaustiveness=1, detect_pockets=True)
		(score, (protein_docked, ligand_docked)) = docker.dock(
		protein_file, ligand_file, dry_run=True)

		# Check returned files exist
		if sys.version_info >= (3, 0):
		return

		assert score.shape == (1,)

		def test_vina_grid_dnn_docker_dock(self):
		"""Test that VinaGridDNNDocker can dock."""
		current_dir = os.path.dirname(os.path.realpath(__file__))

deepchem/models/multitask.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,8 @@ class SingletaskToMultitask(Model):
		"""

		def __init__(self, tasks, model_builder, model_dir=None, verbose=True):
		super(SingletaskToMultitask, self).__init__(self, model_dir=model_dir, verbose=verbose)
		super(SingletaskToMultitask, self).__init__(
		self, model_dir=model_dir, verbose=verbose)
		self.tasks = tasks
		self.task_model_dirs = {}
		self.model_builder = model_builder

deepchem/models/tensorflow_models/init.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,8 @@ class TensorflowGraphModel(Model):
		self.pad_batches = pad_batches
		self.seed = seed

		super(TensorflowGraphModel, self).__init__(self, model_dir=logdir, verbose=verbose)
		super(TensorflowGraphModel, self).__init__(
		self, model_dir=logdir, verbose=verbose)

		# Guard variable to make sure we don't Restore() this model
		# from a disk checkpoint more than once.

deepchem/models/tensorflow_models/fcnet.py

+9 −5

Original line number	Diff line number	Diff line
		@@ -62,7 +62,8 @@ class TensorGraphMultiTaskClassifier(TensorGraph):
		n_classes: int
		the number of classes
		"""
		super(TensorGraphMultiTaskClassifier, self).__init__(mode='classification', **kwargs)
		super(TensorGraphMultiTaskClassifier, self).__init__(
		mode='classification', **kwargs)
		self.n_tasks = n_tasks
		self.n_features = n_features
		self.n_classes = n_classes
		@@ -167,7 +168,8 @@ class TensorGraphMultiTaskRegressor(TensorGraph):
		dropouts: list
		the dropout probablity to use for each layer. The length of this list should equal len(layer_sizes).
		"""
		super(TensorGraphMultiTaskRegressor, self).__init__(mode='regression', **kwargs)
		super(TensorGraphMultiTaskRegressor, self).__init__(
		mode='regression', **kwargs)
		self.n_tasks = n_tasks
		self.n_features = n_features

		@@ -296,7 +298,8 @@ class TensorGraphMultiTaskFitTransformRegressor(TensorGraphMultiTaskRegressor):
		X_b = transformer.X_transform(X_b)
		n_features = X_b.shape[1]
		print("n_features after fit_transform: %d" % int(n_features))
		super(TensorGraphMultiTaskFitTransformRegressor, self).__init__(n_tasks, n_features, batch_size=batch_size, **kwargs)
		super(TensorGraphMultiTaskFitTransformRegressor, self).__init__(
		n_tasks, n_features, batch_size=batch_size, **kwargs)

		def default_generator(self,
		dataset,
		@@ -332,7 +335,8 @@ class TensorGraphMultiTaskFitTransformRegressor(TensorGraphMultiTaskRegressor):
		feed_dict[self.features[0]] = X_t
		yield feed_dict

		return super(TensorGraphMultiTaskFitTransformRegressor, self).predict_proba_on_generator(transform_generator(),
		return super(TensorGraphMultiTaskFitTransformRegressor,
		self).predict_proba_on_generator(transform_generator(),
		transformers)

Admin message