Commit Graph
62 Commits
Author SHA1 Message Date
Ryan Curtin c9c17127f9 Merge branch 'master' of https://github.com/Falit/mlpack into Falit-master 2016-04-14 11:31:51 -04:00
Alexander Leinoff 2330419b86 Removes CMake block termination arguments
Previously CMake block termination commands were required to have arguments
matching the command starting the block. This is no longer necessary and not
the preferred style. This type of change has been implemented in other open
source projects such as: ITK, vxl, and BRAINSTools. It is the preferred style
for KDE. Consistent style practices help improve readability and
maintainability of code.

This was implemented with the shell script:
NOTE: MUST USE GNU compliant version of sed
in else endif endforeach endfunction endmacro endwhile; do
        echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
    done >convert.sed \
    && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' \
       | xargs -0 gsed -i -f convert.sed \
    && rm convert.sed

This is a reimplementation of ITK commit
e52dbe7fa476f6283c9b9d1507fca052355113a4

Fixes #585
2016-03-21 17:23:25 -05:00
Alexander Leinoff 3f3d018ea4 Converts CMake commands to lower case
CMake commands are sometimes given in upper and lower case.
Previously uppercase commands had been required but now commands are
case-insensitive and lowercase commands are preferred. Conversion to lowercase
commands have been implemented in other open source projects such as ITK vxl
and BRAINSTools, and is the preferred style for KDE. Consistent style
practices help to improve readability and maintainability of code.

This was implemented with the shell script:
NOTE: MUST USE GNU compliant version of sed
    cmake --help-command-list \
    | grep -v "cmake version" \
    | while read c; do
        echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
      done >convert.sed \
    && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' \
       | xargs -0 gsed -i -f convert.sed \
    && rm convert.sed

This is a reimplementation of ITK commit
896f6b9220255bed1b3a1409af5257146b54e261
STYLE: Convert CMake-language commands lower case

Fixes #538
2016-03-21 13:44:09 -05:00
Falit 55a515b1a2 Removed trailing underscores in header guards. Resolved issue #533 2016-03-02 12:05:50 +05:30
Grzegorz Krajewski bce8a34741 Delete old backtrace depend. 2016-02-25 16:33:22 +01:00
krajekg@gmail.com e671aa8479 Add mlpack::backtrace for Ubuntu (C++, Clang). 2016-02-24 21:22:10 +01:00
theSundayProgrammer 1a0234fd8a use MSVC14 2016-02-09 07:48:25 +11:00
Ryan Curtin 0c62700893 Preferentially find ATLAS libraries. 2016-02-04 15:59:06 -05:00
The Ranger de42a6aaa6 Use CMAKE_CURRENT_SOURCE_DIR during files generation. 2016-01-30 18:43:10 +02:00
Ryan Curtin a7a05d8fe4 Fix typo: we should be checking HAVE_LAPACK not LAPACK_FOUND.
LAPACK_FOUND is only set if MKL/ACML/etc. isn't found, but HAVE_LAPACK is set in
both situations.
2016-01-27 07:34:58 -08:00
Ryan Curtin cec4ac4275 Issue an error if config.hpp is not found. 2015-12-09 11:41:10 -05:00
Ryan Curtin 5be6093c2e Don't set MLPACK_USE_64BIT_WORD when on a 32-bit system. 2015-10-02 21:08:53 +00:00
Ryan Curtin 3f01d812e9 Compress if statement. 2015-08-06 20:25:51 -04:00
Ryan Curtin 36324dc2dc Update Doxyfile generation and list of trees. 2015-08-03 13:03:27 -04:00
ryan 15c86b8616 Allow the Intel compiler too... not that it works.
"internal error: null pointer"
2015-06-24 16:59:48 -04:00
Ryan Curtin 861ac83cea Fix warning. 2015-04-15 15:02:48 -04:00
ryan f602725d42 Don't overwrite arma_config.hpp unless needed.
This should keep the build from being a complete rebuild every time 'make' is typed.
2015-04-05 18:48:09 -04:00
Ryan Curtin 06b6a04993 What? What is this file? Why is it here?
This looks like it dates back to 2009 or earlier.
2015-04-02 13:59:15 -04:00
ryan 60010cad2a When compiling, see if ARMA_64BIT_WORD is enabled.
Store it in a file.  This will tell the user (or us, the bug receivers) later if libmlpack.so has 32-bit uword or 64-bit uword.
2015-04-01 18:57:10 -04:00
Marcus Edel 870007c6af Minor cleanup (svn -> git transition). 2015-03-25 21:37:08 +01:00
Marcus Edel aaa17fc7f5 Avoid generation of the backtrace.hpp entirely. 2015-03-25 21:14:27 +01:00
Ryan Curtin 15c5546655 Refactor CMake to get version info from git.
Instead of subversion.  This has been a long time coming...
2015-03-24 22:31:31 -04:00
Ryan Curtin bff92b7fcb Don't include inside the mlpack namespace.
A downstream user may try to re-include execinfo and get very confused when it silently fails.
2015-03-24 18:26:19 -04:00
Marcus Edel 2adbba4c04 Using backtrace() become somewhat tricky when going multi-platform. Use CMake to figure out the correct header and library. 2015-03-22 20:51:50 +01:00
Marcus Edel 1588ab09a9 FindPackageHandleStandardArgs.cmake ships with CMake from version 2.8 onwards, since we require CMake 2.8.5 delete the outdated copy. 2015-03-22 20:51:50 +01:00
Ryan Curtin 7250d23298 Better handling of Armadillo configuration files, since ARMA_USE_HDF5 may appear
twice incorrectly (reported by Giampaolo).
2014-12-10 21:44:19 +00:00
Ryan Curtin 230bd4fa69 Better handling of the weird case when includes are needed but the library isn't. 2014-11-14 16:44:40 +00:00
Ryan Curtin e45ce79e2a Smarter handling of HDF5 dependency search, especially for Debian systems where
things are Weird(TM).
2014-11-11 17:15:11 +00:00
Ryan Curtin 4621272364 Force C++11 support for future versions of mlpack. I wouldn't be surprised if
this breaks the build in some places.
2014-10-13 15:23:23 +00:00
Ryan Curtin 1753059fe1 Note that the Armadillo code is MPL-licensed. 2014-08-29 19:39:10 +00:00
Ryan Curtin d0e6102d7b Use FATAL_ERROR instead of FATAL. Also find ARPACK quietly. 2014-08-22 21:29:29 +00:00
Ryan Curtin cdfb98c5cd Be quiet when finding things so as to not duplicate output. 2014-08-22 20:57:50 +00:00
Ryan Curtin d08dc799a3 A first draft of a smarter FindArmadillo script, which takes into account
whether or not ARMA_USE_WRAPPER is being used.
2014-08-22 20:55:17 +00:00
Ryan Curtin 58f92ce883 Actually catch all of the instances where single quotes start lines. 2014-04-07 14:41:28 +00:00
Ryan Curtin 0d106c9efd Doxygen fix so that local paths aren't included in the built documentation. 2014-04-07 14:20:21 +00:00
Ryan Curtin 169204e562 CMake script to create svnversion.hpp, if needed. 2014-01-03 17:58:58 +00:00
Ryan Curtin e8ed1603e0 This is necessary (apparently) until the FindArmadillo changes either get
committed or wrap_libs fixes the problem entirely.
2013-04-10 21:30:24 +00:00
Ryan Curtin bb3697782b Clean up output a little bit. 2013-03-29 23:10:23 +00:00
Ryan Curtin f4d61110e4 Use custom FindArmadillo script, which will find (and link against) HDF5 if
necessary.
2013-03-29 22:59:38 +00:00
Ryan Curtin abf9f7a0e7 Script to modify the file which controls the MATLAB default path to add the
"MLPACK toolbox", as I am calling it.  Also in reference to an earlier commit
message, to clarify, my cat is quite seriously weapons-grade stupid.
2012-10-16 04:32:33 +00:00
Ryan Curtin 565c6bf464 Comments and cmake_minimum_required removed because they are not necessary. 2012-10-16 04:02:29 +00:00
Ryan Curtin 7e5aee3cdb Further clean up script and handle things better when MATLAB does exist. 2012-10-16 03:46:34 +00:00
Ryan Curtin e1bc113cf1 Clean up script a little bit, make it a bit friendlier. 2012-10-16 01:57:22 +00:00
Ryan Curtin ed8adeb3c6 Actually issue errors when mex is not found. 2012-10-15 23:48:34 +00:00
Ryan Curtin e21840d9b5 Utility to find MATLAB and the mex compiler. 2012-10-15 21:56:00 +00:00
Ryan Curtin 91fa2beba0 Missed one handling case 2012-08-11 00:15:04 +00:00
Ryan Curtin ed9501d954 Safer handling of strings which may have spaces in them. 2012-08-11 00:05:45 +00:00
Ryan Curtin 0ab819ff30 FindArmadillo.cmake ships with CMake from version 2.8.5-rc1 onwards. So require
that.
2012-08-08 16:51:56 +00:00
Ryan Curtin 6faadae371 Fix corner case where found version is equal to the required version. 2012-07-14 04:48:52 +00:00
Ryan Curtin e9a930c78c Work for older CMake versions (2.8.2) and finding older Armadillo versions. 2012-05-24 17:26:37 +00:00