Merge branch 'layerwise' of https://github.com/Xtra-Computing/FedTree …

…into layerwise

python/setup.py

@@ -3,22 +3,22 @@
 from shutil import copyfile
 from sys import platform
 
-# dirname = path.dirname(path.abspath(__file__))
+dirname = path.dirname(path.abspath(__file__))
 
-# if platform == "linux" or platform == "linux2":
-#     lib_path = path.abspath(path.join(dirname, '../build/lib/libFedTree.so'))
-# elif platform == "win32":
-#     lib_path = path.abspath(path.join(dirname, '../build/bin/Debug/libFedTree.dll'))
-# elif platform == "darwin":
-#     lib_path = path.abspath(path.join(dirname, '../build/lib/libFedTree.dylib'))
-# else:
-#     print("OS not supported!")
-#     exit()
+if platform == "linux" or platform == "linux2":
+    lib_path = path.abspath(path.join(dirname, '../build/lib/libFedTree.so'))
+elif platform == "win32":
+    lib_path = path.abspath(path.join(dirname, '../build/bin/Debug/libFedTree.dll'))
+elif platform == "darwin":
+    lib_path = path.abspath(path.join(dirname, '../build/lib/libFedTree.dylib'))
+else:
+    print("OS not supported!")
+    exit()
 
-# if not path.exists(path.join(dirname, "fedtree", path.basename(lib_path))):
-#     copyfile(lib_path, path.join(dirname, "fedtree", path.basename(lib_path)))
+if not path.exists(path.join(dirname, "fedtree", path.basename(lib_path))):
+    copyfile(lib_path, path.join(dirname, "fedtree", path.basename(lib_path)))
 
-lib_path = "./fedtree/libFedTree.so"
+# lib_path = "./fedtree/libFedTree.so"
 
 
 setuptools.setup(name="fedtree",

src/FedTree/Tree/gbdt.cpp

@@ -195,7 +195,6 @@ void GBDT::predict_raw(const GBDTParam &model_param, const DataSet &dataSet, Syn
 
     int total_num_node = num_iter * num_class * num_node;
     y_predict.resize(n_instances * num_class);
-    std::cout<<"num_class in predict_raw:"<<num_class<<std::endl;
     SyncArray<Tree::TreeNode> model(total_num_node);
     auto model_data = model.host_data();
     int tree_cnt = 0;