Skip to content

Commit

Permalink
Update HISTORY and version number.
Browse files Browse the repository at this point in the history
  • Loading branch information
rcurtin committed Jul 28, 2018
1 parent b1acbbd commit 9020211
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = mlpack
PROJECT_NUMBER = 3.0.2
PROJECT_NUMBER = 3.0.3
OUTPUT_DIRECTORY = ./doc
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
Expand Down
14 changes: 12 additions & 2 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ src="https://cdn.rawgit.com/mlpack/mlpack.org/e7d36ed8/mlpack-black.svg" style="
<p align="center">
<em>
Download:
<a href="http://www.mlpack.org/files/mlpack-3.0.2.tar.gz">current stable version (3.0.2)</a>
<a href="http://www.mlpack.org/files/mlpack-3.0.3.tar.gz">current stable version (3.0.3)</a>
</em>
</p>

Expand Down
10 changes: 5 additions & 5 deletions doc/examples/sample-ml-app/sample-ml-app/sample-ml-app.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.0.2\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.0.3\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>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)</AdditionalDependencies>
<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)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>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)
<Command>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*"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -169,4 +169,4 @@ xcopy /y "$(ProjectDir)..\..\..\..\src\mlpack\tests\data\german.csv" "$(ProjectD
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
12 changes: 6 additions & 6 deletions doc/guide/build.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ 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:
<a href="http://www.mlpack.org/files/mlpack-3.0.2.tar.gz">mlpack-3.0.2</a>
<a href="http://www.mlpack.org/files/mlpack-3.0.3.tar.gz">mlpack-3.0.3</a>
@section build_simple Simple Linux build instructions
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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions doc/guide/build_windows.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions doc/guide/python_quickstart.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions doc/guide/sample_ml_app.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/mlpack/core/util/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// with higher number than the most recent release.
#define MLPACK_VERSION_MAJOR 3
#define MLPACK_VERSION_MINOR 0
#define MLPACK_VERSION_PATCH 2
#define MLPACK_VERSION_PATCH 3

// The name of the version (for use by --version).
namespace mlpack {
Expand Down

0 comments on commit 9020211

Please sign in to comment.