Add nodename to ONE, iteration_mutex etc.

Summary: Similar as with Iter, LR.

Reviewed By: azzolini

Differential Revision: D6005817

fbshipit-source-id: 6d1260791d1acb3df957315eb9156eac183ee25c
diff --git a/caffe2/python/optimizer.py b/caffe2/python/optimizer.py
index 418f711..7cca45b 100644
--- a/caffe2/python/optimizer.py
+++ b/caffe2/python/optimizer.py
@@ -110,7 +110,9 @@
                     [], optimization_iter_blob, shape=[1],
                     value=iter_val,
                     dtype=core.DataType.INT64)
-                iter_mutex = param_init_net.CreateMutex([], ["iteration_mutex"])
+                iter_mutex = param_init_net.CreateMutex(
+                    [], ["iteration_mutex" + node_name]
+                )
                 net.AtomicIter([iter_mutex, iteration], [iteration])
         else:
             iteration = param_init_net.GetBlobRef(optimization_iter_blob)
@@ -223,7 +225,7 @@
         # to include device information.
         ONE = param_init_net.ConstantFill(
             [],
-            "ONE_{}_{}".format(dev.device_type, dev.cuda_gpu_id),
+            "ONE_{}_{}{}".format(dev.device_type, dev.cuda_gpu_id, dev.node_name),
             shape=[1],
             value=1.0
         )