[KVStore] Small fix on kvstore (#1284)

* update

* str to int

* update

* update

* update

* test remove sync

* update

* update

* update

* update

* update

* update

* update

* update

* clear

examples/mxnet/dis_kvstore/client.py

@@ -44,7 +44,6 @@ def start_client(args):
     if my_client.get_id() % args.num_worker == 0:
         my_client.set_partition_book(name='entity_embed', partition_book=partition)
     else:
-        time.sleep(3)
         my_client.set_partition_book(name='entity_embed')
 
     my_client.print()
@@ -53,8 +52,9 @@ def start_client(args):
 
     print("send request...")
 
-    for i in range(4):
-        my_client.push(name='entity_embed', id_tensor=ID[i], data_tensor=DATA[i])
+    for i in range(100):
+        for i in range(4):
+            my_client.push(name='entity_embed', id_tensor=ID[i], data_tensor=DATA[i])
 
     my_client.barrier()
 
@@ -64,7 +64,8 @@ def start_client(args):
 
     my_client.barrier()
 
-    my_client.push(name='entity_embed', id_tensor=ID[my_client.get_machine_id()], data_tensor=mx.nd.array([[0.,0.,0.],[0.,0.,0.]]))
+    for i in range(100):
+        my_client.push(name='entity_embed', id_tensor=ID[my_client.get_machine_id()], data_tensor=mx.nd.array([[0.,0.,0.],[0.,0.,0.]]))
 
     my_client.barrier()
 
@@ -72,6 +73,7 @@ def start_client(args):
         res = my_client.pull(name='entity_embed', id_tensor=mx.nd.array([0,1,2,3,4,5,6,7], dtype='int64'))
         print(res)
 
+    if my_client.get_id() == 0:
         my_client.shut_down()
 
 

examples/mxnet/dis_kvstore/ip_config.txt

-0 172.31.6.94 30050 2
-1 172.31.4.10 30050 2
-2 172.31.11.99 30050 2
-3 172.31.2.252 30050 2
\ No newline at end of file
+172.31.5.143 30050 2
+172.31.2.169 30050 2
+172.31.8.6 30050 2
+172.31.7.129 30050 2
\ No newline at end of file

examples/mxnet/dis_kvstore/server.py

@@ -43,7 +43,6 @@ def start_server(args):
         my_server.set_global2local(name='entity_embed', global2local=g2l[my_server.get_machine_id()])
         my_server.init_data(name='entity_embed', data_tensor=data[my_server.get_machine_id()])
     else:
-        time.sleep(3)
         my_server.set_global2local(name='entity_embed')
         my_server.init_data(name='entity_embed')
 

examples/pytorch/dis_kvstore/client.py

@@ -44,7 +44,6 @@ def start_client(args):
     if my_client.get_id() % args.num_worker == 0:
         my_client.set_partition_book(name='entity_embed', partition_book=partition)
     else:
-        time.sleep(3)
         my_client.set_partition_book(name='entity_embed')
 
     my_client.print()
@@ -53,8 +52,9 @@ def start_client(args):
 
     print("send request...")
 
-    for i in range(4):
-        my_client.push(name='entity_embed', id_tensor=ID[i], data_tensor=DATA[i])
+    for i in range(100):
+        for i in range(4):
+            my_client.push(name='entity_embed', id_tensor=ID[i], data_tensor=DATA[i])
 
     my_client.barrier()
 
@@ -64,7 +64,8 @@ def start_client(args):
 
     my_client.barrier()
 
-    my_client.push(name='entity_embed', id_tensor=ID[my_client.get_machine_id()], data_tensor=th.tensor([[0.,0.,0.],[0.,0.,0.]]))
+    for i in range(100):
+        my_client.push(name='entity_embed', id_tensor=ID[my_client.get_machine_id()], data_tensor=th.tensor([[0.,0.,0.],[0.,0.,0.]]))
 
     my_client.barrier()
 
@@ -72,6 +73,7 @@ def start_client(args):
         res = my_client.pull(name='entity_embed', id_tensor=th.tensor([0,1,2,3,4,5,6,7]))
         print(res)
 
+    if my_client.get_id() == 0:
         my_client.shut_down()
 
 

examples/pytorch/dis_kvstore/ip_config.txt

-0 172.31.6.94 30050 2
-1 172.31.4.10 30050 2
-2 172.31.11.99 30050 2
-3 172.31.2.252 30050 2
\ No newline at end of file
+172.31.5.143 30050 2
+172.31.2.169 30050 2
+172.31.8.6 30050 2
+172.31.7.129 30050 2
\ No newline at end of file

examples/pytorch/dis_kvstore/server.py

@@ -43,7 +43,6 @@ def start_server(args):
         my_server.set_global2local(name='entity_embed', global2local=g2l[my_server.get_machine_id()])
         my_server.init_data(name='entity_embed', data_tensor=data[my_server.get_machine_id()])
     else:
-        time.sleep(3)
         my_server.set_global2local(name='entity_embed')
         my_server.init_data(name='entity_embed')
 

python/dgl/network.py

@@ -321,11 +321,9 @@ def _recv_kv_msg(receiver):
     raise RuntimeError('Unknown message type: %d' % msg_type.value)
 
 
-def _clear_kv_msg(garbage_msg):
+def _clear_kv_msg(msg):
     """Clear data of kvstore message
     """
     F.sync()
-    for msg in garbage_msg:
-        if msg.c_ptr is not None:
-            _CAPI_DeleteKVMsg(msg.c_ptr)
-    garbage_msg = []
+    if msg.c_ptr is not None:
+        _CAPI_DeleteKVMsg(msg.c_ptr)