Turn off some vina docking in test-suite (9c77cc29) · Commits · 钟慕尧 / deepchem

deepchem/dock/docking.py

+16 −7

Original line number	Diff line number	Diff line
		@@ -24,7 +24,8 @@ from subprocess import call
		class Docker(object):
		"""Abstract Class specifying API for Docking."""

		def dock(self, protein_file, ligand_file, centroid=None, box_dims=None):
		def dock(self, protein_file, ligand_file, centroid=None, box_dims=None,
		dry_run=False):
		raise NotImplementedError

		class VinaGridRFDocker(Docker):
		@@ -47,11 +48,15 @@ class VinaGridRFDocker(Docker):
		self.pose_generator = VinaPoseGenerator(
		exhaustiveness=exhaustiveness, detect_pockets=detect_pockets)

		def dock(self, protein_file, ligand_file, centroid=None, box_dims=None):
		def dock(self, protein_file, ligand_file, centroid=None, box_dims=None,
		dry_run=False):
		"""Docks using Vina and RF."""
		protein_docked, ligand_docked = self.pose_generator.generate_poses(
		protein_file, ligand_file, centroid, box_dims)
		protein_file, ligand_file, centroid, box_dims, dry_run)
		if not dry_run:
		score = self.pose_scorer.score(protein_docked, ligand_docked)
		else:
		score = np.zeros((1,))
		return (score, (protein_docked, ligand_docked))

		class VinaGridDNNDocker(object):
		@@ -78,9 +83,13 @@ class VinaGridDNNDocker(object):
		self.pose_generator = VinaPoseGenerator(
		exhaustiveness=exhaustiveness, detect_pockets=detect_pockets)

		def dock(self, protein_file, ligand_file, centroid=None, box_dims=None):
		def dock(self, protein_file, ligand_file, centroid=None, box_dims=None,
		dry_run=False):
		"""Docks using Vina and DNNs."""
		protein_docked, ligand_docked = self.pose_generator.generate_poses(
		protein_file, ligand_file, centroid, box_dims)
		protein_file, ligand_file, centroid, box_dims, dry_run)
		if not dry_run:
		score = self.pose_scorer.score(protein_docked, ligand_docked)
		else:
		score = np.zeros((1,))
		return (score, (protein_docked, ligand_docked))

deepchem/dock/pose_generation.py

+6 −4

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@ class VinaPoseGenerator(PoseGenerator):


		def generate_poses(self, protein_file, ligand_file,
		centroid=None, box_dims=None, out_dir=None):
		centroid=None, box_dims=None,
		dry_run=False, out_dir=None):
		"""Generates the docked complex and outputs files for docked complex."""
		if out_dir is None:
		out_dir = tempfile.mkdtemp()
		@@ -146,6 +147,7 @@ class VinaPoseGenerator(PoseGenerator):
		log_file = os.path.join(out_dir, "%s_log.txt" % ligand_name)
		out_pdbqt = os.path.join(out_dir, "%s_docked.pdbqt" % ligand_name)
		# TODO(rbharath): Let user specify the number of poses required.
		if not dry_run:
		print("About to call Vina")
		call("%s --config %s --log %s --out %s"
		% (self.vina_cmd, conf_file, log_file, out_pdbqt), shell=True)

deepchem/dock/tests/test_docking.py

+3 −16

Original line number	Diff line number	Diff line
		@@ -62,8 +62,6 @@ class TestDocking(unittest.TestCase):
		protein_file, ligand_file)

		# Check returned files exist
		print("(score, (protein_docked, ligand_docked))")
		print((score, (protein_docked, ligand_docked)))
		assert score.shape == (1,)
		assert os.path.exists(protein_docked)
		assert os.path.exists(ligand_docked)
		@@ -81,13 +79,10 @@ class TestDocking(unittest.TestCase):
		exhaustiveness=1, detect_pockets=False)
		(score, (protein_docked, ligand_docked)) = docker.dock(
		protein_file, ligand_file, centroid=(10, 10, 10),
		box_dims=(1,1,1))

		box_dims=(1,1,1), dry_run=True)

		# Check returned files exist
		assert score.shape == (1,)
		assert os.path.exists(protein_docked)
		assert os.path.exists(ligand_docked)

		def test_pocket_vina_grid_rf_docker_dock(self):
		"""Test that VinaGridRFDocker can dock."""
		@@ -101,15 +96,13 @@ class TestDocking(unittest.TestCase):
		docker = dc.dock.VinaGridRFDocker(
		exhaustiveness=1, detect_pockets=True)
		(score, (protein_docked, ligand_docked)) = docker.dock(
		protein_file, ligand_file)
		protein_file, ligand_file, dry_run=True)

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

		assert score.shape == (1,)
		assert os.path.exists(protein_docked)
		assert os.path.exists(ligand_docked)

		def test_vina_grid_dnn_docker_dock(self):
		"""Test that VinaGridDNNDocker can dock."""
		@@ -123,8 +116,6 @@ class TestDocking(unittest.TestCase):
		protein_file, ligand_file)

		# Check returned files exist
		print("(score, (protein_docked, ligand_docked))")
		print((score, (protein_docked, ligand_docked)))
		assert score.shape == (1,)
		assert os.path.exists(protein_docked)
		assert os.path.exists(ligand_docked)
		@@ -141,11 +132,7 @@ class TestDocking(unittest.TestCase):
		docker = dc.dock.VinaGridDNNDocker(
		exhaustiveness=1, detect_pockets=True)
		(score, (protein_docked, ligand_docked)) = docker.dock(
		protein_file, ligand_file)
		protein_file, ligand_file, dry_run=True)

		# Check returned files exist
		print("(score, (protein_docked, ligand_docked))")
		print((score, (protein_docked, ligand_docked)))
		assert score.shape == (1,)
		assert os.path.exists(protein_docked)
		assert os.path.exists(ligand_docked)

Admin message