Commit 9cacf62b authored by Bharath Ramsundar's avatar Bharath Ramsundar
Browse files

test fixes

parent 8b726493
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ class VinaGridRFDocker(Docker):
    return (score, (protein_docked, ligand_docked))


'''
class VinaGridDNNDocker(object):
  """Vina pose-generation, DNN-models on grid-featurization of complexes."""

@@ -94,7 +95,8 @@ class VinaGridDNNDocker(object):
        dropouts=[.25],
        learning_rate=0.0003,
        weight_init_stddevs=[.1],
        batch_size=64)
        batch_size=64,
        model_dir=self.model_dir)
    model.reload()

    self.pose_scorer = GridPoseScorer(model, feat="grid")
@@ -115,3 +117,4 @@ class VinaGridDNNDocker(object):
    else:
      score = np.zeros((1,))
    return (score, (protein_docked, ligand_docked))
'''
+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ class TestDocking(unittest.TestCase):
      return
    docker = dc.dock.VinaGridRFDocker(exhaustiveness=1, detect_pockets=True)

  '''
  @attr("slow")
  def test_vina_grid_dnn_docker_init(self):
    """Test that VinaGridDNNDocker can be initialized."""
@@ -44,6 +45,7 @@ class TestDocking(unittest.TestCase):
    if sys.version_info >= (3, 0):
      return
    docker = dc.dock.VinaGridDNNDocker(exhaustiveness=1, detect_pockets=True)
  '''

  @attr("slow")
  def test_vina_grid_rf_docker_dock(self):
@@ -104,6 +106,7 @@ class TestDocking(unittest.TestCase):

    assert score.shape == (1,)

  '''
  @attr("slow")
  def test_vina_grid_dnn_docker_dock(self):
    """Test that VinaGridDNNDocker can dock."""
@@ -136,3 +139,4 @@ class TestDocking(unittest.TestCase):

    # Check returned files exist
    assert score.shape == (1,)
  '''
+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ class TestHyperparamOpt(unittest.TestCase):
    params_dict = {"layer_sizes": [(10,), (100,)]}

    def model_builder(model_params, model_dir):
      return dc.models.TensorflowMultiTaskClassifier(
          len(tasks), n_features, model_dir, **model_params)
      return dc.models.MultiTaskClassifier(
          len(tasks), n_features, model_dir=model_dir, **model_params)

    optimizer = dc.hyper.HyperparamOpt(model_builder)
    best_model, best_hyperparams, all_results = optimizer.hyperparam_search(