fixing conflict

jakeret · Mar 27, 2017 · ecf67c9 · ecf67c9
1 parent a4601fa
commit ecf67c9
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 156 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -5,12 +5,13 @@ Credits
 Development Lead
 ----------------
 
-* Joel Akeret <[email protected]>
+* Joel Akeret <[email protected]>
 
 Contributors
 ------------
 
 * `@FelixGruen <https://github.com/FelixGruen>`_ 
+* `@ameya005 <https://github.com/ameya005>`_ 
 
 Citations
 ---------

diff --git a/demo/demo_radio_data.ipynb b/demo/demo_radio_data.ipynb
diff --git a/demo/demo_toy_problem.ipynb b/demo/demo_toy_problem.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 click
 numpy
-Pillow
+Pillow
+tensorflow>=1.0.0
diff --git a/tf_unet/unet.py b/tf_unet/unet.py
@@ -215,11 +215,11 @@ def _get_cost(self, logits, cost_name, cost_kwargs):
             if class_weights is not None:
                 class_weights = tf.constant(np.array(class_weights, dtype=np.float32))
 
-                weight_map = tf.mul(flat_labels, class_weights)
+                weight_map = tf.multiply(flat_labels, class_weights)
                 weight_map = tf.reduce_sum(weight_map, axis=1)
 
                 loss_map = tf.nn.softmax_cross_entropy_with_logits(flat_logits, flat_labels)
-                weighted_loss = tf.mul(loss_map, weight_map)
+                weighted_loss = tf.multiply(loss_map, weight_map)
 
                 loss = tf.reduce_mean(weighted_loss)