From c4f91f1e9253695d5d710686bbd69bea6538a87b Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Fri, 27 Jul 2018 21:53:27 -0400 Subject: [PATCH] Update HISTORY and version number. --- HISTORY.md | 14 ++++++++++++-- README.md | 2 +- .../sample-ml-app/sample-ml-app.vcxproj | 10 +++++----- doc/guide/build.hpp | 12 ++++++------ doc/guide/build_windows.hpp | 18 +++++++++--------- doc/guide/python_quickstart.hpp | 6 +++--- doc/guide/sample_ml_app.hpp | 8 ++++---- 7 files changed, 40 insertions(+), 30 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 1b75266808..2e0728f347 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,10 +1,20 @@ -### mlpack ?.?.? -###### ????-??-?? +### mlpack 3.0.3 +###### 2018-07-27 * Fix Visual Studio compilation issue (#1443). * Allow running local_coordinate_coding binding with no initial_dictionary parameter when input_model is not specified (#1457). + * Make use of OpenMP optional via the CMake 'USE_OPENMP' configuration + variable (#1474). + + * Accelerate FNN training by 20-30% by avoiding redundant calculations + (#1467). + + * Fix math::RandomSeed() usage in tests (#1462, #1440). + + * Generate better Python setup.py with documentation (#1460). + ### mlpack 3.0.2 ###### 2018-06-08 * Documentation generation fixes for Python bindings (#1421). diff --git a/README.md b/README.md index d72c6f24f0..3f39ae086f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ src="https://cdn.rawgit.com/mlpack/mlpack.org/e7d36ed8/mlpack-black.svg" style="

Download: - current stable version (3.0.2) + current stable version (3.0.3)

diff --git a/doc/examples/sample-ml-app/sample-ml-app/sample-ml-app.vcxproj b/doc/examples/sample-ml-app/sample-ml-app/sample-ml-app.vcxproj index 8f207550dd..84400fb0c7 100644 --- a/doc/examples/sample-ml-app/sample-ml-app/sample-ml-app.vcxproj +++ b/doc/examples/sample-ml-app/sample-ml-app/sample-ml-app.vcxproj @@ -104,16 +104,16 @@ true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) false - C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.0.2\build\include;%(AdditionalIncludeDirectories) + C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.0.3\build\include;%(AdditionalIncludeDirectories) Console true - C:\mlpack\mlpack-3.0.2\build\Debug\mlpack.lib;C:\boost\boost_1_66_0\lib64-msvc-14.1\libboost_serialization-vc141-mt-gd-x64-1_66.lib;C:\boost\boost_1_66_0\lib64-msvc-14.1\libboost_program_options-vc141-mt-gd-x64-1_66.lib;%(AdditionalDependencies) + C:\mlpack\mlpack-3.0.3\build\Debug\mlpack.lib;C:\boost\boost_1_66_0\lib64-msvc-14.1\libboost_serialization-vc141-mt-gd-x64-1_66.lib;C:\boost\boost_1_66_0\lib64-msvc-14.1\libboost_program_options-vc141-mt-gd-x64-1_66.lib;%(AdditionalDependencies) - xcopy /y "C:\mlpack\mlpack-3.0.2\build\Debug\mlpack.dll" $(OutDir) -xcopy /y "C:\mlpack\mlpack-3.0.2\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir) + xcopy /y "C:\mlpack\mlpack-3.0.3\build\Debug\mlpack.dll" $(OutDir) +xcopy /y "C:\mlpack\mlpack-3.0.3\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir) xcopy /y "$(ProjectDir)..\..\..\..\src\mlpack\tests\data\german.csv" "$(ProjectDir)data\german.csv*" @@ -169,4 +169,4 @@ xcopy /y "$(ProjectDir)..\..\..\..\src\mlpack\tests\data\german.csv" "$(ProjectD - \ No newline at end of file + diff --git a/doc/guide/build.hpp b/doc/guide/build.hpp index 2fdbda97f7..98f3b3d066 100644 --- a/doc/guide/build.hpp +++ b/doc/guide/build.hpp @@ -29,7 +29,7 @@ to build mlpack on Windows, see \ref build_windows (alternatively, you can read is based on older versions). You can download the latest mlpack release from here: -mlpack-3.0.2 +mlpack-3.0.3 @section build_simple Simple Linux build instructions @@ -37,9 +37,9 @@ Assuming all dependencies are installed in the system, you can run the commands below directly to build and install mlpack. @code -$ wget http://www.mlpack.org/files/mlpack-3.0.2.tar.gz -$ tar -xvzpf mlpack-3.0.2.tar.gz -$ mkdir mlpack-3.0.2/build && cd mlpack-3.0.2/build +$ wget http://www.mlpack.org/files/mlpack-3.0.3.tar.gz +$ tar -xvzpf mlpack-3.0.3.tar.gz +$ mkdir mlpack-3.0.3/build && cd mlpack-3.0.3/build $ cmake ../ $ make -j4 # The -j is the number of cores you want to use for a build. $ sudo make install @@ -64,8 +64,8 @@ configure mlpack. First we should unpack the mlpack source and create a build directory. @code -$ tar -xvzpf mlpack-3.0.2.tar.gz -$ cd mlpack-3.0.2 +$ tar -xvzpf mlpack-3.0.3.tar.gz +$ cd mlpack-3.0.3 $ mkdir build @endcode diff --git a/doc/guide/build_windows.hpp b/doc/guide/build_windows.hpp index 645afa7adf..3c26b4dca3 100644 --- a/doc/guide/build_windows.hpp +++ b/doc/guide/build_windows.hpp @@ -21,7 +21,7 @@ Those guides could be used in addition to this tutorial. This tutorial has been designed and tested using: - Windows 10 - Visual Studio 2017 (toolset v141) -- mlpack-3.0.2 +- mlpack-3.0.3 - OpenBLAS.0.2.14.1 - boost_1_66_0-msvc-14.1-64 - armadillo-8.500.1 @@ -39,10 +39,10 @@ and make sure you can use it from the Command Prompt (may need to add to the PAT @section build_windows_instructions Windows build instructions -- Unzip mlpack to "C:\mlpack\mlpack-3.0.2" +- Unzip mlpack to "C:\mlpack\mlpack-3.0.3" - Open Visual Studio and select: File > New > Project from Existing Code - Type of project: Visual C++ - - Project location: "C:\mlpack\mlpack-3.0.2" + - Project location: "C:\mlpack\mlpack-3.0.3" - Project name: mlpack - Finish - We will use this Visual Studio project to get the OpenBLAS dependency in the next section @@ -77,7 +77,7 @@ This tutorial follows the second approach for simplicity. - Run cmake: @code -cmake -G "Visual Studio 15 2017 Win64" -DBLAS_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.2/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.2/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DCMAKE_PREFIX:FILEPATH="C:/mlpack/armadillo" -DBUILD_SHARED_LIBS=OFF .. +cmake -G "Visual Studio 15 2017 Win64" -DBLAS_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.3/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.3/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DCMAKE_PREFIX:FILEPATH="C:/mlpack/armadillo" -DBUILD_SHARED_LIBS=OFF .. @endcode @note If you are using different directory paths, a different configuration (e.g. Release) @@ -89,17 +89,17 @@ or a different VS version, update the cmake command accordingly. @section build_windows_mlpack Building mlpack -- Create a "build" directory into "C:\mlpack\mlpack-3.0.2\" -- Open the Command Prompt and navigate to "C:\mlpack\mlpack-3.0.2\build" +- Create a "build" directory into "C:\mlpack\mlpack-3.0.3\" +- Open the Command Prompt and navigate to "C:\mlpack\mlpack-3.0.3\build" - Run cmake: @code -cmake -G "Visual Studio 15 2017 Win64" -DBLAS_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.2/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.2/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DARMADILLO_INCLUDE_DIR="C:/mlpack/armadillo-8.500.1/include" -DARMADILLO_LIBRARY:FILEPATH="C:/mlpack/armadillo-8.500.1/build/Debug/armadillo.lib" -DBOOST_INCLUDEDIR:PATH="C:/boost/boost_1_66_0/" -DBOOST_LIBRARYDIR:PATH="C:/boost/boost_1_66_0/lib64-msvc-14.1" -DDEBUG=OFF -DPROFILE=OFF .. +cmake -G "Visual Studio 15 2017 Win64" -DBLAS_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.3/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.3/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DARMADILLO_INCLUDE_DIR="C:/mlpack/armadillo-8.500.1/include" -DARMADILLO_LIBRARY:FILEPATH="C:/mlpack/armadillo-8.500.1/build/Debug/armadillo.lib" -DBOOST_INCLUDEDIR:PATH="C:/boost/boost_1_66_0/" -DBOOST_LIBRARYDIR:PATH="C:/boost/boost_1_66_0/lib64-msvc-14.1" -DDEBUG=OFF -DPROFILE=OFF .. @endcode -- Once it has successfully finished, open "C:\mlpack\mlpack-3.0.2\build\mlpack.sln" +- Once it has successfully finished, open "C:\mlpack\mlpack-3.0.3\build\mlpack.sln" - Build > Build Solution (this may be by default in Debug mode) -- Once it has sucessfully finished, you will find the library files you need in: "C:\mlpack\mlpack-3.0.2\build\Debug" (or "C:\mlpack\mlpack-3.0.2\build\Release" if you changed to Release mode) +- Once it has sucessfully finished, you will find the library files you need in: "C:\mlpack\mlpack-3.0.3\build\Debug" (or "C:\mlpack\mlpack-3.0.3\build\Release" if you changed to Release mode) You are ready to create your first application, take a look at the @ref sample_ml_app "Sample C++ ML App" diff --git a/doc/guide/python_quickstart.hpp b/doc/guide/python_quickstart.hpp index d197f6f8d0..86ce52f98b 100644 --- a/doc/guide/python_quickstart.hpp +++ b/doc/guide/python_quickstart.hpp @@ -31,9 +31,9 @@ build and install mlpack. You can copy-paste the commands into your shell. @code{.sh} sudo apt-get install libboost-all-dev g++ cmake libarmadillo-dev python-pip wget sudo pip install cython setuptools distutils numpy pandas -wget http://www.mlpack.org/files/mlpack-3.0.2.tar.gz -tar -xvzpf mlpack-3.0.2.tar.gz -mkdir -p mlpack-3.0.2/build/ && cd mlpack-3.0.2/build/ +wget http://www.mlpack.org/files/mlpack-3.0.3.tar.gz +tar -xvzpf mlpack-3.0.3.tar.gz +mkdir -p mlpack-3.0.3/build/ && cd mlpack-3.0.3/build/ cmake ../ && make -j4 && sudo make install @endcode diff --git a/doc/guide/sample_ml_app.hpp b/doc/guide/sample_ml_app.hpp index e2d451406f..5975dcfe94 100644 --- a/doc/guide/sample_ml_app.hpp +++ b/doc/guide/sample_ml_app.hpp @@ -29,18 +29,18 @@ mlpack and dependencies in Release Mode). @code - C:\boost\boost_1_66_0 - C:\mlpack\armadillo-8.500.1\include - - C:\mlpack\mlpack-3.0.2\build\include + - C:\mlpack\mlpack-3.0.3\build\include @endcode - Under Linker > Input > Additional Dependencies add: @code - - C:\mlpack\mlpack-3.0.2\build\Debug\mlpack.lib + - C:\mlpack\mlpack-3.0.3\build\Debug\mlpack.lib - C:\boost\boost_1_66_0\lib64-msvc-14.1\libboost_serialization-vc141-mt-gd-x64-1_66.lib - C:\boost\boost_1_66_0\lib64-msvc-14.1\libboost_program_options-vc141-mt-gd-x64-1_66.lib @endcode - Under Build Events > Post-Build Event > Command Line add: @code - - xcopy /y "C:\mlpack\mlpack-3.0.2\build\Debug\mlpack.dll" $(OutDir) - - xcopy /y "C:\mlpack\mlpack-3.0.2\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir) + - xcopy /y "C:\mlpack\mlpack-3.0.3\build\Debug\mlpack.dll" $(OutDir) + - xcopy /y "C:\mlpack\mlpack-3.0.3\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir) @endcode @note Recent versions of Visual Studio set "Conformance Mode" enabled by default. This causes some issues with