fix nu-svc bugs

rename dataset.h to config.h
Xtra-Computing · Nov 2, 2017 · b3c63ed · b3c63ed
1 parent b36d9c4
commit b3c63ed
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .git
 .*
+!.gitignore
 build
 dataset/*
 !dataset/*.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,13 +26,13 @@ set(COMMON_INCLUDES ${PROJECT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR})
 set(LINK_LIBRARY ${CUDA_cusparse_LIBRARY})
 
 set(DATASET_DIR ${PROJECT_SOURCE_DIR}/dataset/)
-configure_file(include/test/dataset.h.in dataset.h)
+configure_file(include/thundersvm/config.h.in config.h)
 
 include_directories(${COMMON_INCLUDES})
 add_subdirectory(${PROJECT_SOURCE_DIR}/src/thundersvm)
 
 
-set(PROJECT_TEST_NAME ${PROJECT_NAME}_test)
+set(PROJECT_TEST_NAME ${PROJECT_NAME}-test)
 add_subdirectory(${PROJECT_SOURCE_DIR}/src/test)
 add_custom_target(runtest
         COMMAND ${PROJECT_TEST_NAME})

diff --git a/include/test/dataset.h.in → include/thundersvm/config.h.in b/include/test/dataset.h.in → include/thundersvm/config.h.in
diff --git a/include/thundersvm/model/svc.h b/include/thundersvm/model/svc.h
@@ -24,7 +24,8 @@ class SVC : public SvmModel {
 
 protected:
     virtual void train_binary(const DataSet &dataset, int i, int j, int k);
-    void record_binary_model(int k, const SyncData<real> &alpha, const SyncData<int> &y, real rho,
+
+    virtual void record_binary_model(int k, const SyncData<real> &alpha, const SyncData<int> &y, real rho,
                              const vector<int> &original_index, const DataSet::node2d &original_instance);
 
 private:

diff --git a/src/test/test_cross_validation.cpp b/src/test/test_cross_validation.cpp
@@ -2,7 +2,7 @@
 // Created by jiashuai on 17-10-13.
 //
 #include <gtest/gtest.h>
-#include <dataset.h>
+#include <config.h>
 #include <thundersvm/model/svc.h>
 #include <thundersvm/model/svr.h>
 

diff --git a/src/test/test_dataset.cpp b/src/test/test_dataset.cpp
@@ -3,7 +3,7 @@
 //
 #include "gtest/gtest.h"
 #include "thundersvm/dataset.h"
-#include <dataset.h>
+#include <config.h>
 TEST(SvmProblemTest, load_dataset){
     DataSet dataSet;
     dataSet.load_from_file(DATASET_DIR "test_dataset.txt");

diff --git a/src/test/test_kernelmatrix.cpp b/src/test/test_kernelmatrix.cpp
@@ -3,7 +3,7 @@
 //
 #include "gtest/gtest.h"
 #include "thundersvm/kernelmatrix.h"
-#include <dataset.h>
+#include <config.h>
 real rbf_kernel(const DataSet::node2d &instances, int x, int y, real gamma) {
     real sum = 0;
     auto i = instances[x].begin();

diff --git a/src/test/test_main.cpp b/src/test/test_main.cpp
@@ -8,6 +8,7 @@ INITIALIZE_EASYLOGGINGPP
 int main(int argc, char **argv) {
     ::testing::InitGoogleTest(&argc, argv);
     el::Loggers::reconfigureAllLoggers(el::ConfigurationType::Format, "%datetime %level %fbase:%line : %msg");
-    cudaSetDevice(0);
+    el::Loggers::addFlag(el::LoggingFlag::ColoredTerminalOutput);
+    cudaSetDevice(1);
     return RUN_ALL_TESTS();
 }
diff --git a/src/test/test_nusvc.cpp b/src/test/test_nusvc.cpp
@@ -3,7 +3,7 @@
 #include <thundersvm/svmparam.h>
 #include <thundersvm/model/svmmodel.h>
 #include <thundersvm/model/nusvc.h>
-#include <dataset.h>
+#include <config.h>
 
 //
 // Created by jiashuai on 17-10-30.
@@ -46,16 +46,11 @@ class NuSVCTest : public ::testing::Test {
 //    load_dataset_and_train(DATASET_DIR "test_dataset.txt", DATASET_DIR "test_dataset.txt", 100, 0.5, 0.1);
 //}
 
-//TEST_F(NuSVCTest, a9a) {
-//    EXPECT_NEAR(load_dataset_and_train(DATASET_DIR
-//                        "a9a", DATASET_DIR
-//                        "a9a.t", 100, 0.5, 0.1), 0.826608, 1e-3);
-//}
-//TEST_F(NuSVCTest, a1a1024) {
-//    EXPECT_NEAR(load_dataset_and_train(DATASET_DIR
-//                        "a1a1024", DATASET_DIR
-//                        "a1a1024", 100, 0.5), 0.826608, 1e-3);
-//}
+TEST_F(NuSVCTest, a9a) {
+    EXPECT_NEAR(load_dataset_and_train(DATASET_DIR
+                        "a9a", DATASET_DIR
+                        "a9a.t", 100, 0.5, 0.1), 0.826608, 1e-3);
+}
 //
 //TEST_F(NuSVCTest, mnist) {
 //    load_dataset_and_train(DATASET_DIR "mnist.scale", DATASET_DIR "mnist.scale.t", 10, 0.125, 0.1);

diff --git a/src/test/test_nusvr.cpp b/src/test/test_nusvr.cpp
@@ -1,6 +1,6 @@
-#include <src/test/gtest/src/googletest/googletest/include/gtest/gtest.h>
+#include <gtest/gtest.h>
 #include <thundersvm/dataset.h>
-#include <dataset.h>
+#include <config.h>
 #include <thundersvm/model/svmmodel.h>
 #include <thundersvm/model/nusvr.h>
 

diff --git a/src/test/test_oneclass_svc.cpp b/src/test/test_oneclass_svc.cpp
@@ -3,7 +3,7 @@
 //
 #include <gtest/gtest.h>
 #include <thundersvm/model/oneclass_svc.h>
-#include <dataset.h>
+#include <config.h>
 
 TEST(OneClassSVCTest, train) {
     DataSet dataset;

diff --git a/src/test/test_svc.cpp b/src/test/test_svc.cpp
@@ -3,7 +3,7 @@
 //
 #include <thundersvm/model/svc.h>
 #include "gtest/gtest.h"
-#include "dataset.h"
+#include "config.h"
 
 class SVCTest : public ::testing::Test {
 protected:

diff --git a/src/test/test_svr.cpp b/src/test/test_svr.cpp
@@ -2,7 +2,7 @@
 // Created by jiashuai on 17-10-5.
 //
 #include <gtest/gtest.h>
-#include <dataset.h>
+#include <config.h>
 #include <thundersvm/model/nusvr.h>
 
 TEST(SVRTest, train) {

diff --git a/src/thundersvm/kernel/smo_kernel.cu b/src/thundersvm/kernel/smo_kernel.cu
@@ -185,14 +185,14 @@ nu_smo_solve_kernel(const int *label, real *f_values, real *alpha, real *alpha_d
 
         if (numOfIter == 0) {
             local_eps = max(eps, 0.1f * local_diff);
+            if (tid == 0) {
+                diff_and_bias[0] = local_diff;
+            }
         }
 
         if (local_diff < local_eps) {
             alpha[wsi] = a;
             alpha_diff[tid] = -(a - aold) * y;
-            if (tid == 0) {
-                diff_and_bias[0] = local_diff;
-            }
             break;
         }
         __syncthreads();

diff --git a/src/thundersvm/model/svmmodel.cu b/src/thundersvm/model/svmmodel.cu
@@ -130,12 +130,10 @@ void SvmModel::save_to_file(string path) {
     fs_model << "total_sv " << sv.size() << endl;
     fs_model << "rho " << rho << endl;
     fs_model << "SV " << endl;
-    vector<real> sv_coef = this->coef;
-    vector<vector<DataSet::node>> SV = this->sv;
     for (int i = 0; i < sv.size(); i++) {
-        fs_model << setprecision(16) << sv_coef[i] << " ";
+        fs_model << setprecision(16) << coef[i] << " ";
 
-        vector<DataSet::node> p = SV[sv_index[i]];
+        vector<DataSet::node> p = sv[sv_index[i]];
         int k = 0;
 //        if (param.kernel_type == SvmParam::PRECOMPUTED)
 //            fs_model << "0:" << p[k].value << " ";

diff --git a/src/thundersvm/solver/csmosolver.cu b/src/thundersvm/solver/csmosolver.cu
@@ -61,12 +61,16 @@ void CSMOSolver::solve(const KernelMatrix &k_mat, const SyncData<int> &y, SyncDa
         //update f
         SAFE_KERNEL_LAUNCH(update_f, f_val.device_data(), ws_size, alpha_diff.device_data(), k_mat_rows.device_data(),
                            n_instances);
-        LOG_EVERY_N(10, INFO) << "diff=" << diff_and_bias[0];
+        if (iter % 10 == 0) {
+            printf(".");
+            std::cout.flush();
+        }
         if (diff_and_bias[0] < eps) {
             rho = calculate_rho(f_val, y, alpha, Cp, Cn);
             break;
         }
     }
+    printf("\n");
 }
 
 void CSMOSolver::select_working_set(vector<int> &ws_indicator, const SyncData<int> &f_idx2sort, const SyncData<int> &y,