Skip to content

Commit

Permalink
Update version to 3.3.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
rcurtin committed Apr 29, 2020
1 parent 6422861 commit 44e1beb
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Expand Up @@ -359,22 +359,22 @@ endif ()
find_package(Ensmallen 2.10.0)
if (NOT ENSMALLEN_FOUND)
if (DOWNLOAD_ENSMALLEN)
file(DOWNLOAD http://www.ensmallen.org/files/ensmallen-latest.tar.gz
"${CMAKE_BINARY_DIR}/deps/ensmallen-latest.tar.gz"
file(DOWNLOAD http://www.ensmallen.org/files/ensmallen-2.12.1.tar.gz
"${CMAKE_BINARY_DIR}/deps/ensmallen-2.12.1.tar.gz"
STATUS ENS_DOWNLOAD_STATUS_LIST LOG ENS_DOWNLOAD_LOG
SHOW_PROGRESS)
list(GET ENS_DOWNLOAD_STATUS_LIST 0 ENS_DOWNLOAD_STATUS)
if (ENS_DOWNLOAD_STATUS EQUAL 0)
execute_process(COMMAND ${CMAKE_COMMAND} -E
tar xzf "${CMAKE_BINARY_DIR}/deps/ensmallen-latest.tar.gz"
tar xzf "${CMAKE_BINARY_DIR}/deps/ensmallen-2.12.1.tar.gz"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/deps/")

# Get the name of the directory.
file (GLOB ENS_DIRECTORIES RELATIVE "${CMAKE_BINARY_DIR}/deps/"
"${CMAKE_BINARY_DIR}/deps/ensmallen-[0-9]*.[0-9]*.[0-9]*")
# list(FILTER) is not available on 3.5 or older, but try to keep
# configuring without filtering the list anyway (it might work if only
# the file ensmallen-latest.tar.gz is present.
# the file ensmallen-2.12.1.tar.gz is present.
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.6.0")
list(FILTER ENS_DIRECTORIES EXCLUDE REGEX "ensmallen-.*\.tar\.gz")
endif ()
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -23,7 +23,7 @@ src="https://cdn.rawgit.com/mlpack/mlpack.org/e7d36ed8/mlpack-black.svg" style="
<p align="center">
<em>
Download:
<a href="https://www.mlpack.org/files/mlpack-3.3.0.tar.gz">current stable version (3.3.0)</a>
<a href="https://www.mlpack.org/files/mlpack-3.3.1.tar.gz">current stable version (3.3.1)</a>
</em>
</p>

Expand Down Expand Up @@ -103,7 +103,7 @@ mlpack has the following dependencies:
Armadillo >= 8.400.0
Boost (program_options, math_c99, unit_test_framework, serialization,
spirit) >= 1.58.0
CMake >= 3.3.2
CMake >= 3.3.1
ensmallen >= 2.10.0

All of those should be available in your distribution's package manager. If
Expand All @@ -118,7 +118,7 @@ following Python packages are installed:
numpy
pandas >= 0.15.0

If you would like to build the Julia bindings, make sure that Julia >= 1.3.0 is
If you would like to build the Julia bindings, make sure that Julia >= 3.3.1 is
installed.

If the STB library headers are available, image loading support will be
Expand All @@ -138,7 +138,7 @@ on Ubuntu, you can install mlpack with the following command:

Note: Older Ubuntu versions may not have the most recent version of mlpack
available---for instance, at the time of this writing, Ubuntu 16.04 only has
mlpack 2.0.1 available. Options include upgrading your Ubuntu version, finding
mlpack 3.3.1 available. Options include upgrading your Ubuntu version, finding
a PPA or other non-official sources, or installing with a manual build.

There are some useful pages to consult in addition to this section:
Expand Down
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.3.0\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.3.1\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>C:\mlpack\mlpack-3.3.0\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.3.1\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.3.0\build\Debug\mlpack.dll" $(OutDir)
xcopy /y "C:\mlpack\mlpack-3.3.0\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir)
<Command>xcopy /y "C:\mlpack\mlpack-3.3.1\build\Debug\mlpack.dll" $(OutDir)
xcopy /y "C:\mlpack\mlpack-3.3.1\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
12 changes: 6 additions & 6 deletions doc/guide/build.hpp
Expand Up @@ -30,17 +30,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="https://www.mlpack.org/files/mlpack-3.3.0.tar.gz">mlpack-3.3.0</a>
<a href="https://www.mlpack.org/files/mlpack-3.3.1.tar.gz">mlpack-3.3.1</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 https://www.mlpack.org/files/mlpack-3.3.0.tar.gz
$ tar -xvzpf mlpack-3.3.0.tar.gz
$ mkdir mlpack-3.3.0/build && cd mlpack-3.3.0/build
$ wget https://www.mlpack.org/files/mlpack-3.3.1.tar.gz
$ tar -xvzpf mlpack-3.3.1.tar.gz
$ mkdir mlpack-3.3.1/build && cd mlpack-3.3.1/build
$ cmake ../
$ make -j4 # The -j is the number of cores you want to use for a build.
$ sudo make install
Expand All @@ -65,8 +65,8 @@ configure mlpack.
First we should unpack the mlpack source and create a build directory.
@code
$ tar -xvzpf mlpack-3.3.0.tar.gz
$ cd mlpack-3.3.0
$ tar -xvzpf mlpack-3.3.1.tar.gz
$ cd mlpack-3.3.1
$ mkdir build
@endcode
Expand Down
6 changes: 3 additions & 3 deletions doc/guide/python_quickstart.hpp
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 https://www.mlpack.org/files/mlpack-3.3.0.tar.gz
tar -xvzpf mlpack-3.3.0.tar.gz
mkdir -p mlpack-3.3.0/build/ && cd mlpack-3.3.0/build/
wget https://www.mlpack.org/files/mlpack-3.3.1.tar.gz
tar -xvzpf mlpack-3.3.1.tar.gz
mkdir -p mlpack-3.3.1/build/ && cd mlpack-3.3.1/build/
cmake ../ && make -j4 && sudo make install
@endcode
Expand Down
8 changes: 4 additions & 4 deletions doc/guide/sample_ml_app.hpp
Expand Up @@ -29,18 +29,18 @@ mlpack and dependencies in Release Mode).
@code
- C:\boost\boost_1_71_0\lib\native\include
- C:\mlpack\armadillo-9.800.3\include
- C:\mlpack\mlpack-3.3.0\build\include
- C:\mlpack\mlpack-3.3.1\build\include
@endcode
- Under Linker > Input > Additional Dependencies add:
@code
- C:\mlpack\mlpack-3.3.0\build\Debug\mlpack.lib
- C:\mlpack\mlpack-3.3.1\build\Debug\mlpack.lib
- C:\boost\boost_1_71_0\lib64-msvc-14.2\libboost_serialization-vc142-mt-gd-x64-1_71.lib
- C:\boost\boost_1_71_0\lib64-msvc-14.2\libboost_program_options-vc142-mt-gd-x64-1_71.lib
@endcode
- Under Build Events > Post-Build Event > Command Line add:
@code
- xcopy /y "C:\mlpack\mlpack-3.3.0\build\Debug\mlpack.dll" $(OutDir)
- xcopy /y "C:\mlpack\mlpack-3.3.0\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir)
- xcopy /y "C:\mlpack\mlpack-3.3.1\build\Debug\mlpack.dll" $(OutDir)
- xcopy /y "C:\mlpack\mlpack-3.3.1\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

0 comments on commit 44e1beb

Please sign in to comment.