diff --git a/README.md b/README.md index d010911173..fc0fd56b91 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.3) + current stable version (3.0.4)

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 84400fb0c7..caf7ecbf39 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.3\build\include;%(AdditionalIncludeDirectories) + C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.0.4\build\include;%(AdditionalIncludeDirectories) Console true - 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) + C:\mlpack\mlpack-3.0.4\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.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 "C:\mlpack\mlpack-3.0.4\build\Debug\mlpack.dll" $(OutDir) +xcopy /y "C:\mlpack\mlpack-3.0.4\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*" diff --git a/doc/guide/build.hpp b/doc/guide/build.hpp index 98f3b3d066..c91df36b5d 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.3 +mlpack-3.0.4 @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.3.tar.gz -$ tar -xvzpf mlpack-3.0.3.tar.gz -$ mkdir mlpack-3.0.3/build && cd mlpack-3.0.3/build +$ wget http://www.mlpack.org/files/mlpack-3.0.4.tar.gz +$ tar -xvzpf mlpack-3.0.4.tar.gz +$ mkdir mlpack-3.0.4/build && cd mlpack-3.0.4/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.3.tar.gz -$ cd mlpack-3.0.3 +$ tar -xvzpf mlpack-3.0.4.tar.gz +$ cd mlpack-3.0.4 $ mkdir build @endcode diff --git a/doc/guide/build_windows.hpp b/doc/guide/build_windows.hpp index 3c26b4dca3..d57452ed4d 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.3 +- mlpack-3.0.4 - 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.3" +- Unzip mlpack to "C:\mlpack\mlpack-3.0.4" - Open Visual Studio and select: File > New > Project from Existing Code - Type of project: Visual C++ - - Project location: "C:\mlpack\mlpack-3.0.3" + - Project location: "C:\mlpack\mlpack-3.0.4" - 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.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 .. +cmake -G "Visual Studio 15 2017 Win64" -DBLAS_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.4/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.4/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.3\" -- Open the Command Prompt and navigate to "C:\mlpack\mlpack-3.0.3\build" +- Create a "build" directory into "C:\mlpack\mlpack-3.0.4\" +- Open the Command Prompt and navigate to "C:\mlpack\mlpack-3.0.4\build" - Run cmake: @code -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 .. +cmake -G "Visual Studio 15 2017 Win64" -DBLAS_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.4/packages/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="C:/mlpack/mlpack-3.0.4/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.3\build\mlpack.sln" +- Once it has successfully finished, open "C:\mlpack\mlpack-3.0.4\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.3\build\Debug" (or "C:\mlpack\mlpack-3.0.3\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.4\build\Debug" (or "C:\mlpack\mlpack-3.0.4\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 86ce52f98b..71c0d90c5e 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.3.tar.gz -tar -xvzpf mlpack-3.0.3.tar.gz -mkdir -p mlpack-3.0.3/build/ && cd mlpack-3.0.3/build/ +wget http://www.mlpack.org/files/mlpack-3.0.4.tar.gz +tar -xvzpf mlpack-3.0.4.tar.gz +mkdir -p mlpack-3.0.4/build/ && cd mlpack-3.0.4/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 5975dcfe94..0e4fb63800 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.3\build\include + - C:\mlpack\mlpack-3.0.4\build\include @endcode - Under Linker > Input > Additional Dependencies add: @code - - C:\mlpack\mlpack-3.0.3\build\Debug\mlpack.lib + - C:\mlpack\mlpack-3.0.4\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.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 "C:\mlpack\mlpack-3.0.4\build\Debug\mlpack.dll" $(OutDir) + - xcopy /y "C:\mlpack\mlpack-3.0.4\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