Convert DAGTensorGraph to DAGModel

joe-nano · Mar 25, 2018 · f20016c · f20016c
1 parent ccd2f0f
commit f20016c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/deepchem/models/__init__.py b/deepchem/models/__init__.py
@@ -17,7 +17,7 @@
 from deepchem.models.tensorgraph.robust_multitask import RobustMultitaskClassifier
 from deepchem.models.tensorgraph.robust_multitask import RobustMultitaskRegressor
 from deepchem.models.tensorgraph.progressive_multitask import ProgressiveMultitaskRegressor, ProgressiveMultitaskClassifier
-from deepchem.models.tensorgraph.models.graph_models import WeaveModel, DTNNModel, DAGTensorGraph, GraphConvModel, MPNNModel
+from deepchem.models.tensorgraph.models.graph_models import WeaveModel, DTNNModel, DAGModel, GraphConvModel, MPNNModel
 from deepchem.models.tensorgraph.models.symmetry_function_regression import BPSymmetryFunctionRegression, ANIRegression
 
 from deepchem.models.tensorgraph.models.seqtoseq import SeqToSeq

diff --git a/deepchem/models/tensorgraph/models/graph_models.py b/deepchem/models/tensorgraph/models/graph_models.py
@@ -358,7 +358,7 @@ def predict(self, dataset, transformers=[], outputs=None):
     return undo_transforms(retval, transformers)
 
 
-class DAGTensorGraph(TensorGraph):
+class DAGModel(TensorGraph):
 
   def __init__(self,
                n_tasks,
@@ -390,7 +390,7 @@ def __init__(self,
     self.n_graph_feat = n_graph_feat
     self.n_outputs = n_outputs
     self.mode = mode
-    super(DAGTensorGraph, self).__init__(**kwargs)
+    super(DAGModel, self).__init__(**kwargs)
     self.build_graph()
 
   def build_graph(self):
@@ -508,7 +508,7 @@ def default_generator(self,
         yield feed_dict
 
   def predict_on_generator(self, generator, transformers=[], outputs=None):
-    out = super(DAGTensorGraph, self).predict_on_generator(
+    out = super(DAGModel, self).predict_on_generator(
         generator, transformers=[], outputs=outputs)
     if outputs is None:
       outputs = self.outputs

diff --git a/deepchem/models/tests/test_overfit.py b/deepchem/models/tests/test_overfit.py
@@ -661,7 +661,7 @@ def test_tensorgraph_DAG_singletask_regression_overfit(self):
     transformer = dc.trans.DAGTransformer(max_atoms=50)
     dataset = transformer.transform(dataset)
 
-    model = dc.models.DAGTensorGraph(
+    model = dc.models.DAGModel(
         n_tasks,
         max_atoms=50,
         n_atom_feat=n_feat,

diff --git a/deepchem/molnet/run_benchmark_models.py b/deepchem/molnet/run_benchmark_models.py
@@ -223,7 +223,7 @@ def model_builder(model_dir_logreg):
       test_dataset.reshard(reshard_size)
       test_dataset = transformer.transform(test_dataset)
 
-    model = deepchem.models.DAGTensorGraph(
+    model = deepchem.models.DAGModel(
         len(tasks),
         max_atoms=max_atoms,
         n_atom_feat=n_features,
@@ -558,7 +558,7 @@ def benchmark_regression(train_dataset,
       test_dataset.reshard(reshard_size)
       test_dataset = transformer.transform(test_dataset)
 
-    model = deepchem.models.DAGTensorGraph(
+    model = deepchem.models.DAGModel(
         len(tasks),
         max_atoms=max_atoms,
         n_atom_feat=n_features,

diff --git a/examples/delaney/delaney_tensorgraph_DAG.py b/examples/delaney/delaney_tensorgraph_DAG.py
@@ -34,7 +34,7 @@
 valid_dataset.reshard(reshard_size)
 valid_dataset = transformer.transform(valid_dataset)
 
-model = dc.models.DAGTensorGraph(
+model = dc.models.DAGModel(
     len(delaney_tasks),
     max_atoms=max_atoms,
     n_atom_feat=n_atom_feat,

diff --git a/examples/membrane_permeability/membrane_permeability_graph_conv.py b/examples/membrane_permeability/membrane_permeability_graph_conv.py
@@ -34,7 +34,7 @@
 valid_dataset.reshard(reshard_size)
 valid_dataset = transformer.transform(valid_dataset)
 
-model = dc.models.DAGTensorGraph(
+model = dc.models.DAGModel(
     len(permeability_tasks),
     max_atoms=max_atoms,
     n_atom_feat=n_atom_feat,

diff --git a/examples/tox21/tox21_tensorgraph_DAG.py b/examples/tox21/tox21_tensorgraph_DAG.py
@@ -34,7 +34,7 @@
 n_atom_feat = 75
 batch_size = 64
 
-model = dc.models.DAGTensorGraph(
+model = dc.models.DAGModel(
     len(tox21_tasks),
     max_atoms=max_atoms,
     n_atom_feat=n_atom_feat,