Commit b7c8563f authored by miaecle's avatar miaecle
Browse files

add estimator compatibility

parents 3679181d 7342aa8c

README.md

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ git clone https://github.com/deepchem/deepchem.git # Clone deepchem source 
cd deepchem

bash scripts/install_deepchem_conda.sh deepchem

source activate deepchem

yes | pip install tensorflow-gpu==1.5.0      # If you want GPU support

yes | pip install tensorflow-gpu==1.6.0      # If you want GPU support

python setup.py install                                # Manual install

nosetests -a '!slow' -v deepchem --nologcapture        # Run tests

```

deepchem/data/datasets.py

+6 −6
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ class Dataset(object): 
    >>> dataset = NumpyDataset(np.ones((2,2)))

    >>> for x, y, w, id in dataset.itersamples():

    ...   print(x.tolist(), y.tolist(), w.tolist(), id)

    [1.0 1.0] [0.0] [0.0] 0

    [1.0 1.0] [0.0] [0.0] 1

    [1.0, 1.0] [0.0] [0.0] 0

    [1.0, 1.0] [0.0] [0.0] 1

    """

    raise NotImplementedError()
@@ -409,8 +409,8 @@ class NumpyDataset(Dataset): 
    >>> dataset = NumpyDataset(np.ones((2,2)))

    >>> for x, y, w, id in dataset.itersamples():

    ...   print(x.tolist(), y.tolist(), w.tolist(), id)

    [1.0 1.0] [0.0] [0.0] 0

    [1.0 1.0] [0.0] [0.0] 1

    [1.0, 1.0] [0.0] [0.0] 0

    [1.0, 1.0] [0.0] [0.0] 1

    """

    n_samples = self._X.shape[0]

    return ((self._X[i], self._y[i], self._w[i], self._ids[i])
@@ -889,8 +889,8 @@ class DiskDataset(Dataset): 
    >>> dataset = DiskDataset.from_numpy(np.ones((2,2)), np.ones((2,1)), verbose=False)

    >>> for x, y, w, id in dataset.itersamples():

    ...   print(x.tolist(), y.tolist(), w.tolist(), id)

    [1.0 1.0] [0.0] [0.0] 0

    [1.0 1.0] [0.0] [0.0] 1

    [1.0, 1.0] [1.0] [1.0] 0

    [1.0, 1.0] [1.0] [1.0] 1

    """



    def iterate(dataset):

deepchem/feat/graph_features.py

+50 −7
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ from __future__ import unicode_literals 


import numpy as np

from rdkit import Chem

import itertools, operator



from deepchem.feat import Featurizer

from deepchem.feat.mol_graphs import ConvMol, WeaveMol
@@ -199,8 +198,8 @@ def bond_features(bond, use_chirality=False): 
  ]

  if use_chirality:

    bond_feats = bond_feats + one_of_k_encoding_unk(

        str(bond.GetStereo(),

            ["STEREONONE", "STEREOANY", "STEREOZ", "STEREOE"]))

        str(bond.GetStereo()),

        ["STEREONONE", "STEREOANY", "STEREOZ", "STEREOE"])

  return np.array(bond_feats)
@@ -264,7 +263,8 @@ def find_distance(a1, num_atoms, canon_adj_list, max_distance=7): 
class ConvMolFeaturizer(Featurizer):

  name = ['conv_mol']



  def __init__(self, master_atom=False, use_chirality=False):

  def __init__(self, master_atom=False, use_chirality=False,

               atom_properties=[]):

    """

    Parameters

    ----------
@@ -274,7 +274,20 @@ class ConvMolFeaturizer(Featurizer): 
      the molecule.  This technique is briefly discussed in

      Neural Message Passing for Quantum Chemistry

      https://arxiv.org/pdf/1704.01212.pdf



    use_chirality: Boolean

      if true then make the resulting atom features aware of the 

      chirality of the molecules in question

    atom_properties: list of string or None

      properties in the RDKit Mol object to use as additional

      atom-level features in the larger molecular feature.  If None,

      then no atom-level properties are used.  Properties should be in the 

      RDKit mol object should be in the form 

      atom XXXXXXXX NAME

      where XXXXXXXX is a zero-padded 8 digit number coresponding to the

      zero-indexed atom index of each atom and NAME is the name of the property

      provided in atom_properties.  So "atom 00000000 sasa" would be the

      name of the molecule level property in mol where the solvent 

      accessible surface area of atom 0 would be stored. 



    Since ConvMol is an object and not a numpy array, need to set dtype to

    object.
@@ -282,12 +295,39 @@ class ConvMolFeaturizer(Featurizer): 
    self.dtype = object

    self.master_atom = master_atom

    self.use_chirality = use_chirality

    self.atom_properties = list(atom_properties)



  def _get_atom_properties(self, atom):

    """

    For a given input RDKit atom return the values of the properties

    requested when initializing the featurize.  See the __init__ of the

    class for a full description of the names of the properties

    

    Parameters

    ----------

    atom: RDKit.rdchem.Atom

      Atom to get the properties of

    returns a numpy lists of floats of the same size as self.atom_properties

    """

    values = []

    for prop in self.atom_properties:

      mol_prop_name = str("atom %08d %s" % (atom.GetIdx(), prop))

      try:

        values.append(float(atom.GetOwningMol().GetProp(mol_prop_name)))

      except KeyError:

        raise KeyError("No property %s found in %s in %s" %

                       (mol_prop_name, atom.GetOwningMol(), self))

    return np.array(values)



  def _featurize(self, mol):

    """Encodes mol as a ConvMol object."""

    # Get the node features

    idx_nodes = [(a.GetIdx(), atom_features(

        a, use_chirality=self.use_chirality)) for a in mol.GetAtoms()]

    idx_nodes = [(a.GetIdx(),

                  np.concatenate((atom_features(

                      a, use_chirality=self.use_chirality),

                                  self._get_atom_properties(a))))

                 for a in mol.GetAtoms()]



    idx_nodes.sort()  # Sort by ind to ensure same order as rd_kit

    idx, nodes = list(zip(*idx_nodes))
@@ -315,6 +355,9 @@ class ConvMolFeaturizer(Featurizer): 


    return ConvMol(nodes, canon_adj_list)



  def feature_length(self):

    return 75 + len(self.atom_properties)





class WeaveFeaturizer(Featurizer):

  name = ['weave_mol']

deepchem/models/__init__.py

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ from deepchem.models.tensorgraph.IRV import TensorflowMultiTaskIRVClassifier 
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 WeaveTensorGraph, DTNNTensorGraph, DAGTensorGraph, GraphConvTensorGraph, MPNNTensorGraph

from deepchem.models.tensorgraph.models.graph_models import WeaveTensorGraph, DTNNTensorGraph, DAGTensorGraph, GraphConvModel, MPNNTensorGraph

from deepchem.models.tensorgraph.models.symmetry_function_regression import BPSymmetryFunctionRegression, ANIRegression



from deepchem.models.tensorgraph.models.seqtoseq import SeqToSeq
@@ -25,3 +25,7 @@ from deepchem.models.tensorgraph.models.gan import GAN, WGAN 
from deepchem.models.tensorgraph.models.text_cnn import TextCNNTensorGraph

from deepchem.models.tensorgraph.sequential import Sequential

from deepchem.models.tensorgraph.models.sequence_dnn import SequenceDNN



#################### Compatibility imports for renamed TensorGraph models. Remove below with DeepChem 3.0. ####################



from deepchem.models.tensorgraph.models.graph_models import GraphConvTensorGraph

deepchem/models/tensorgraph/layers.py

+15 −6
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ class Layer(object): 
    tensors = []

    for input in in_layers:

      tensors.append(tf.convert_to_tensor(input))

    if reshape and len(tensors) > 1:

    if reshape and len(tensors) > 1 and all(

        '_shape' in dir(l) for l in in_layers):

      shapes = [t.get_shape() for t in tensors]

      if any(s != shapes[0] for s in shapes[1:]):

        # Reshape everything to match the input with the most dimensions.
@@ -1070,6 +1071,7 @@ class TimeSeriesDense(Layer): 
class Input(Layer):



  def __init__(self, shape, dtype=tf.float32, **kwargs):

    if shape is not None:

      self._shape = tuple(shape)

    self.dtype = dtype

    super(Input, self).__init__(**kwargs)
@@ -1079,18 +1081,25 @@ class Input(Layer): 
    if in_layers is None:

      in_layers = self.in_layers

    in_layers = convert_to_layers(in_layers)

    try:

      shape = self.shape

    except NotImplementedError:

      shape = None

    if len(in_layers) > 0:

      queue = in_layers[0]

      placeholder = queue.out_tensors[self.get_pre_q_name()]

      self.out_tensor = tf.placeholder_with_default(placeholder, self._shape)

      self.out_tensor = tf.placeholder_with_default(placeholder, shape)

      return self.out_tensor

    out_tensor = tf.placeholder(dtype=self.dtype, shape=self._shape)

    out_tensor = tf.placeholder(dtype=self.dtype, shape=shape)

    if set_tensors:

      self.out_tensor = out_tensor

    return out_tensor



  def create_pre_q(self):

    q_shape = (None,) + self._shape[1:]

    try:

      q_shape = (None,) + self.shape[1:]

    except NotImplementedError:

      q_shape = None

    return Input(shape=q_shape, name="%s_pre_q" % self.name, dtype=self.dtype)



  def get_pre_q_name(self):

CRA Git | Maintained and supported by SUSTech CRA and CCSE