From 8253ae6074745580f37cf12a010c8797899762a9 Mon Sep 17 00:00:00 2001 From: aksnzhy Date: Mon, 29 Oct 2018 12:37:12 +0800 Subject: [PATCH] 0.3.6 release --- README.md | 4 ++++ doc/install.rst | 2 +- doc/news.md | 6 +++++- doc/python_package.rst | 2 +- makeR.sh | 2 +- python-package/README.rst | 2 +- python-package/xlearn/VERSION | 2 +- src/c_api/c_api.cc | 2 +- src/solver/solver.cc | 8 ++------ 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a4b57268..6d43c246 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,10 @@ xLearn can be used for solving large-scale machine learning problems. First, xLe ## What's New + - 2018-10-29 xLearn 0.3.6 version release. Main update: + + * Add incremental Reader, which can save 50% memory cost. + - 2018-10-22 xLearn 0.3.5 version release. Main update: * Fix bugs in 0.3.4. diff --git a/doc/install.rst b/doc/install.rst index 05ac8d3b..64a8928a 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -124,7 +124,7 @@ You will see the following message if the installation is successful: :: > <| |___| __/ (_| | | | | | | /_/\_\_____/\___|\__,_|_| |_| |_| - xLearn -- 0.31 Version -- + xLearn -- 0.36 Version -- ------------------------------------------------------------------------- diff --git a/doc/news.md b/doc/news.md index 28454b4f..dc2d092f 100644 --- a/doc/news.md +++ b/doc/news.md @@ -1,5 +1,9 @@ ## What's New + - 2018-10-29 xLearn 0.3.6 version release. Main update: + + * Add incremental Reader, which can save 50% memory cost. + - 2018-10-22 xLearn 0.3.5 version release. Main update: * Fix bugs in 0.3.4. @@ -39,4 +43,4 @@ * New Documents * Faster FTRL algorithm - - 2017-11-24 The first version (0.1.0) of xLearn release ! + - 2017-11-24 The first version (0.1.0) of xLearn release ! \ No newline at end of file diff --git a/doc/python_package.rst b/doc/python_package.rst index 17d13917..67ccacaf 100644 --- a/doc/python_package.rst +++ b/doc/python_package.rst @@ -18,7 +18,7 @@ If you install xLearn Python package successfully, you will see: :: > <| |___| __/ (_| | | | | | | /_/\_\_____/\___|\__,_|_| |_| |_| - xLearn -- 0.35 Version -- + xLearn -- 0.36 Version -- ------------------------------------------------------------------------- Quick Start diff --git a/makeR.sh b/makeR.sh index 6446e856..a1aeff97 100644 --- a/makeR.sh +++ b/makeR.sh @@ -2,4 +2,4 @@ rm -r xlearn cp -r R-package xlearn cp -r src xlearn/src/src R CMD build xlearn -R CMD INSTALL xlearn_0.3.5.tar.gz +R CMD INSTALL xlearn_0.3.6.tar.gz diff --git a/python-package/README.rst b/python-package/README.rst index 173cac54..62e144b7 100644 --- a/python-package/README.rst +++ b/python-package/README.rst @@ -18,7 +18,7 @@ If you install xLearn Python package successfully, you will see :: > <| |___| __/ (_| | | | | | | /_/\_\_____/\___|\__,_|_| |_| |_| - xLearn -- 0.35 Version -- + xLearn -- 0.36 Version -- ------------------------------------------------------------------------- Quick Start diff --git a/python-package/xlearn/VERSION b/python-package/xlearn/VERSION index 42045aca..449d7e73 100644 --- a/python-package/xlearn/VERSION +++ b/python-package/xlearn/VERSION @@ -1 +1 @@ -0.3.4 +0.3.6 diff --git a/src/c_api/c_api.cc b/src/c_api/c_api.cc index 04ce607f..727f8eb1 100644 --- a/src/c_api/c_api.cc +++ b/src/c_api/c_api.cc @@ -39,7 +39,7 @@ XL_DLL int XLearnHello() { " \\ \\/ / | / _ \\/ _` | '__| '_ \\ \n" " > <| |___| __/ (_| | | | | | |\n" " /_/\\_\\_____/\\___|\\__,_|_| |_| |_|\n\n" - " xLearn -- 0.35 Version --\n" + " xLearn -- 0.36 Version --\n" "----------------------------------------------------------------------------------------------\n" "\n"; Color::Modifier green(Color::FG_GREEN); diff --git a/src/solver/solver.cc b/src/solver/solver.cc index 494c7251..637cb013 100644 --- a/src/solver/solver.cc +++ b/src/solver/solver.cc @@ -238,9 +238,7 @@ void Solver::init_train() { // Create Reader for (int i = 0; i < num_reader; ++i) { reader_[i] = create_reader(); - if (reader_[i]->Type().compare("on-disk") == 0) { - reader_[i]->SetBlockSize(hyper_param_.block_size); - } + reader_[i]->SetBlockSize(hyper_param_.block_size); reader_[i]->Initialize(file_list[i]); if (!hyper_param_.on_disk) { reader_[i]->SetShuffle(true); @@ -430,9 +428,7 @@ void Solver::init_predict() { // Create Reader reader_.resize(1, create_reader()); CHECK_NE(hyper_param_.test_set_file.empty(), true); - if (reader_[0]->Type().compare("on-disk") == 0) { - reader_[0]->SetBlockSize(hyper_param_.block_size); - } + reader_[0]->SetBlockSize(hyper_param_.block_size); reader_[0]->Initialize(hyper_param_.test_set_file); reader_[0]->SetShuffle(false); if (reader_[0] == nullptr) {