Commit 6420c12a authored by Bharath Ramsundar's avatar Bharath Ramsundar
Browse files

Removed keras dependency (first try)

parent 66387854
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ install:
- conda install -c omnia openbabel
- conda install joblib
- conda install h5py
- pip install keras
- pip install six
#- pip install keras
- export KERAS_BACKEND=tensorflow
- conda install -c omnia mdtraj
- python setup.py install
+1 −1
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ import time
import numpy as np
import tensorflow as tf

from deepchem.nn import model_ops
from deepchem.metrics import from_one_hot
from deepchem.models.tensorflow_models import TensorflowGraph
from deepchem.models.tensorflow_models import TensorflowClassifier
from deepchem.models.tensorflow_models import TensorflowRegressor
from deepchem.models.tensorflow_models import model_ops
from deepchem.metrics import to_one_hot

class TensorflowMultiTaskClassifier(TensorflowClassifier):
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ import time
from deepchem.metrics import from_one_hot
from deepchem.models.tensorflow_models import TensorflowGraph
from deepchem.models.tensorflow_models import TensorflowGraphModel
from deepchem.models.tensorflow_models import model_ops
from deepchem.nn import model_ops
from deepchem.utils.save import log
from deepchem.data import pad_features
from deepchem.metrics import to_one_hot
+1 −1
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ import tensorflow as tf
from deepchem.utils.save import log
from deepchem.metrics import to_one_hot
from deepchem.metrics import from_one_hot
from deepchem.nn import model_ops
from deepchem.models.tensorflow_models import TensorflowGraph
from deepchem.models.tensorflow_models.fcnet import TensorflowMultiTaskClassifier
from deepchem.models.tensorflow_models.fcnet import TensorflowMultiTaskRegressor
from deepchem.models.tensorflow_models import model_ops

class ProgressiveJointRegressor(TensorflowMultiTaskRegressor):
  """Implements a progressive multitask neural network.
+1 −1
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ import tensorflow as tf
from deepchem.utils.save import log
from deepchem.metrics import to_one_hot
from deepchem.metrics import from_one_hot
from deepchem.nn import model_ops
from deepchem.models.tensorflow_models import TensorflowGraph
from deepchem.models.tensorflow_models.fcnet import TensorflowMultiTaskClassifier
from deepchem.models.tensorflow_models.fcnet import TensorflowMultiTaskRegressor
from deepchem.models.tensorflow_models import model_ops

class ProgressiveMultitaskRegressor(TensorflowMultiTaskRegressor):
  """Implements a progressive multitask neural network.
Loading