diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eeef287b8..9929324142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,14 +382,14 @@ 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. @@ -397,7 +397,7 @@ if (NOT ENSMALLEN_FOUND) "${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 () diff --git a/Doxyfile b/Doxyfile index acca2303d8..2682bbd20e 100644 --- a/Doxyfile +++ b/Doxyfile @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = mlpack -PROJECT_NUMBER = 3.3.2 +PROJECT_NUMBER = 3.2.2 OUTPUT_DIRECTORY = ./doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/README.md b/README.md index cc44e0c8ca..f25d21961c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ src="https://cdn.rawgit.com/mlpack/mlpack.org/e7d36ed8/mlpack-black.svg" style="

Download: - current stable version (3.3.2) + current stable version (3.2.2)

@@ -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.2.2 ensmallen >= 2.10.0 All of those should be available in your distribution's package manager. If @@ -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 >= 3.3.2 is +If you would like to build the Julia bindings, make sure that Julia >= 3.2.2 is installed. If the STB library headers are available, image loading support will be @@ -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 3.3.2 available. Options include upgrading your Ubuntu version, finding +mlpack 3.2.2 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: 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 52024666d2..05b714df53 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.3.2\build\include;%(AdditionalIncludeDirectories) + C:\boost\boost_1_66_0;C:\mlpack\armadillo-8.500.1\include;C:\mlpack\mlpack-3.2.2\build\include;%(AdditionalIncludeDirectories) Console true - C:\mlpack\mlpack-3.3.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.2.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) - xcopy /y "C:\mlpack\mlpack-3.3.2\build\Debug\mlpack.dll" $(OutDir) -xcopy /y "C:\mlpack\mlpack-3.3.2\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir) + xcopy /y "C:\mlpack\mlpack-3.2.2\build\Debug\mlpack.dll" $(OutDir) +xcopy /y "C:\mlpack\mlpack-3.2.2\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 96b89fb314..df5e2edb82 100644 --- a/doc/guide/build.hpp +++ b/doc/guide/build.hpp @@ -30,7 +30,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.3.2 +mlpack-3.2.2 @section build_simple Simple Linux build instructions @@ -38,9 +38,9 @@ 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.2.tar.gz -$ tar -xvzpf mlpack-3.3.2.tar.gz -$ mkdir mlpack-3.3.2/build && cd mlpack-3.3.2/build +$ wget https://www.mlpack.org/files/mlpack-3.2.2.tar.gz +$ tar -xvzpf mlpack-3.2.2.tar.gz +$ mkdir mlpack-3.2.2/build && cd mlpack-3.2.2/build $ cmake ../ $ make -j4 # The -j is the number of cores you want to use for a build. $ sudo make install @@ -65,8 +65,8 @@ configure mlpack. First we should unpack the mlpack source and create a build directory. @code -$ tar -xvzpf mlpack-3.3.2.tar.gz -$ cd mlpack-3.3.2 +$ tar -xvzpf mlpack-3.2.2.tar.gz +$ cd mlpack-3.2.2 $ mkdir build @endcode diff --git a/doc/guide/python_quickstart.hpp b/doc/guide/python_quickstart.hpp index 2983458029..981c1449f3 100644 --- a/doc/guide/python_quickstart.hpp +++ b/doc/guide/python_quickstart.hpp @@ -32,9 +32,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.2.tar.gz -tar -xvzpf mlpack-3.3.2.tar.gz -mkdir -p mlpack-3.3.2/build/ && cd mlpack-3.3.2/build/ +wget https://www.mlpack.org/files/mlpack-3.2.2.tar.gz +tar -xvzpf mlpack-3.2.2.tar.gz +mkdir -p mlpack-3.2.2/build/ && cd mlpack-3.2.2/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 fd9ca39096..6e42a19c07 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_71_0\lib\native\include - C:\mlpack\armadillo-9.800.3\include - - C:\mlpack\mlpack-3.3.2\build\include + - C:\mlpack\mlpack-3.2.2\build\include @endcode - Under Linker > Input > Additional Dependencies add: @code - - C:\mlpack\mlpack-3.3.2\build\Debug\mlpack.lib + - C:\mlpack\mlpack-3.2.2\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.2\build\Debug\mlpack.dll" $(OutDir) - - xcopy /y "C:\mlpack\mlpack-3.3.2\packages\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll" $(OutDir) + - xcopy /y "C:\mlpack\mlpack-3.2.2\build\Debug\mlpack.dll" $(OutDir) + - xcopy /y "C:\mlpack\mlpack-3.2.2\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 diff --git a/src/mlpack/CMakeLists.txt b/src/mlpack/CMakeLists.txt index bbc4f02a74..ebfec2b6a6 100644 --- a/src/mlpack/CMakeLists.txt +++ b/src/mlpack/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries(mlpack ${MLPACK_LIBRARIES}) set_target_properties(mlpack PROPERTIES - VERSION 3.3 + VERSION 3.2 SOVERSION 3 ) diff --git a/src/mlpack/core/util/version.hpp b/src/mlpack/core/util/version.hpp index 4f0c4f6de7..1389e1e689 100644 --- a/src/mlpack/core/util/version.hpp +++ b/src/mlpack/core/util/version.hpp @@ -17,8 +17,8 @@ // The version of mlpack. If this is a git repository, this will be a version // with higher number than the most recent release. #define MLPACK_VERSION_MAJOR 3 -#define MLPACK_VERSION_MINOR 3 -#define MLPACK_VERSION_PATCH 3 +#define MLPACK_VERSION_MINOR 2 +#define MLPACK_VERSION_PATCH 2 // The name of the version (for use by --version). namespace mlpack {