updated use of mul_elemwise

iskandr · Jun 27, 2018 · e7ca5dd · e7ca5dd
1 parent 80c03f4
commit e7ca5dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
 sudo: false  # Use container-based infrastructure
 language: python
+env:
+  global:
+    - KERAS_BACKEND=tensorflow
+    - CUDA_VISIBLE_DEVICES=""
 matrix:
   include:
-    # Wish I could use Python 3.5 but cvxpy fails to install due to the
-    # multiprocess package. No idea why!
     - python: 2.7
-      env: KERAS_BACKEND=tensorflow
     - python: 3.6
-      env: KERAS_BACKEND=tensorflow
 before_install:
   # Commands below copied from: http://conda.pydata.org/docs/travis.html
   # We do this conditionally because it saves us some downloading if the

diff --git a/fancyimpute/nuclear_norm_minimization.py b/fancyimpute/nuclear_norm_minimization.py
@@ -76,8 +76,8 @@ def _constraints(self, X, missing_mask, S, error_tolerance):
             Representation of solution variable
         """
         ok_mask = ~missing_mask
-        masked_X = cvxpy.mul_elemwise(ok_mask, X)
-        masked_S = cvxpy.mul_elemwise(ok_mask, S)
+        masked_X = cvxpy.multiply(ok_mask, X)
+        masked_S = cvxpy.multiply(ok_mask, S)
         abs_diff = cvxpy.abs(masked_S - masked_X)
         close_to_data = abs_diff <= error_tolerance
         constraints = [close_to_data]