Merge pull request #27 from hammerlab/no-more-autoencoder

No more autoencoder
iskandr · Feb 13, 2017 · 542eec6 · 542eec6
2 parents c81ebe5 + a55810b
commit 542eec6
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 335 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,8 +43,6 @@ install:
   - conda install -c cvxgrp scs=1.2.6
   - pip install pypandoc
   - pip install -r requirements.txt
-  # install the latest Theano
-  - pip install git+git://github.com/Theano/Theano.git --upgrade --no-deps
   - pip install .
   - pip install coveralls
   - export PACKAGE_DIR=`pwd`

diff --git a/fancyimpute/__init__.py b/fancyimpute/__init__.py
@@ -4,7 +4,6 @@
 from .nuclear_norm_minimization import NuclearNormMinimization
 from .bayesian_ridge_regression import BayesianRidgeRegression
 from .mice import MICE
-from .auto_encoder import AutoEncoder
 from .matrix_factorization import MatrixFactorization
 from .iterative_svd import IterativeSVD
 from .simple_fill import SimpleFill
@@ -18,7 +17,6 @@
     "NuclearNormMinimization",
     "BayesianRidgeRegression",
     "MICE",
-    "AutoEncoder",
     "MatrixFactorization",
     "IterativeSVD",
     "SimpleFill",

diff --git a/fancyimpute/auto_encoder.py b/fancyimpute/auto_encoder.py
diff --git a/fancyimpute/neuralnet_helpers.py b/fancyimpute/neuralnet_helpers.py
diff --git a/fancyimpute/similarity_weighted_averaging.py b/fancyimpute/similarity_weighted_averaging.py
@@ -153,8 +153,8 @@ def complete_dict(
     def complete(self, X):
         if self.verbose:
             print(
-                "[SimilarityWeightedAveraging] Creating dictionary from matrix with shape %s" % (
-                    X.shape,))
+                ("[SimilarityWeightedAveraging] Creating dictionary from matrix "
+                 " with shape %s") % (X.shape,))
         missing_mask = np.isnan(X)
         observed_mask = ~missing_mask
         sparse_dict = matrix_to_nested_dictionary(

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,4 @@
 six
-keras
 downhill
 climate
 cvxpy

diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@
 if __name__ == '__main__':
     setup(
         name='fancyimpute',
-        version="0.1.0",
+        version="0.2.0",
         description="Matrix completion and feature imputation algorithms",
         author="Alex Rubinsteyn, Sergey Feldman",
         author_email="alex {dot} rubinsteyn {at} gmail {dot} com",
@@ -59,8 +59,6 @@
             # used by NuclearNormMinimization
             'cvxpy',
             'scikit-learn>=0.17.1',
-            # used by AutoEncoder
-            'keras',
             # used by MatrixFactorization
             'downhill',
             'climate',

diff --git a/test/test_auto_encoder.py b/test/test_auto_encoder.py