updates

source/train/TTrain.cpp

@@ -82,8 +82,8 @@ void TestTrain()
     config.Add("nepoch", 5);
     config.Add("jobdev0", -1);
     config.Add("jobdev1", -1);
-    //config.Add("jobdev2", -1);
-    //config.Add("jobdev3", -1);
+    config.Add("jobdev2", -1);
+    config.Add("jobdev3", -1);
     //config.Add("jobdev4", -1);
 
     int serverDevID = config.GetInt("jobdev0", -1);

source/train/XLeader.cpp

@@ -396,16 +396,11 @@ bool XLeader::Run(XConfig * config, DataDistributeBase * dataDistributor,
         /* all member models */
         XList membersAll(jworkers.count);
 
-        /* records of the active member models */
-        XList memberRecords(jworkers.count);
-
         for (int i = 0; i < jworkers.count; i++) {
             XWorkerJob* worker = (XWorkerJob*)jworkers[i];
             membersAll.Add(worker->GetModel());
-            if (active[i] == 1) {
+            if (active[i] == 1)
                 members.Add(worker->GetModel());
-                memberRecords.Add(worker->GetRecord());
-            }
         }
 
         /* jobs in queue 2: collect the (gradient) data and other stuff. This

source/train/XTrainer.cpp

@@ -173,11 +173,22 @@ void XTrainer::ShowSettings(XConfig* config)
     XPRINT2(1, stderr, "%25s = %d\n", "nworker", workerNum);
 
     if (workerNum > 0) {
-        XPRINT2(1, stderr, "%25s = device[%d]\n", "worker0(server)", ids[0]);
+        if (ids[0] < 0) {
+            XPRINT2(1, stderr, "%25s = CPU[%d]\n", "worker0(server)", ids[0]);
+        }
+        else{
+            XPRINT2(1, stderr, "%25s = GPU[%d]\n", "worker0(server)", ids[0]);
+        }
+
         for (int i = 1; i < workerNum; i++) {
             char name[32];
             sprintf(name, "worker%d", i);
-            XPRINT2(1, stderr, "%25s = device[%d]\n", name, ids[i]);
+            if (ids[i] < 0) {
+                XPRINT2(1, stderr, "%25s = CPU[%d]\n", name, ids[i]);
+            }
+            else {
+                XPRINT2(1, stderr, "%25s = GPU[%d]\n", name, ids[i]);
+            }
         }
     }