Merge pull request #119 from zoq/cb

Callbacks + Templated Optimize().
mlpack · Sep 4, 2019 · 45efb3e · 45efb3e
2 parents 63e4d46 + 9ea1acb
commit 45efb3e
Show file tree

Hide file tree

Showing 251 changed files with 14,049 additions and 5,269 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,12 +8,12 @@ env:
 
 before_install:
   - sudo apt-get update
-  - sudo apt-get install -y --allow-unauthenticated libopenblas-dev liblapack-dev g++
+  - sudo apt-get install -y --allow-unauthenticated libopenblas-dev liblapack-dev g++ xz-utils
   - if [ $ARMADILLO == "latest" ]; then
       curl https://ftp.fau.de/macports/distfiles/armadillo/`curl https://ftp.fau.de/macports/distfiles/armadillo/ -- | grep '.tar.xz' | sed 's/^.*<a href="\(armadillo-[0-9]*.[0-9]*.[0-9]*.tar.xz\)".*$/\1/' | tail -1` | tar xvJ && cd armadillo*;
     fi
   - if [ $ARMADILLO == "minimum" ]; then
-      curl https://ftp.fau.de/macports/distfiles/armadillo/armadillo-6.500.5.tar.gz | tar xvz && cd armadillo*;
+      curl https://ftp.fau.de/macports/distfiles/armadillo/armadillo-8.400.0.tar.xz | tar -xvJ && cd armadillo*;
     fi
   - cmake . && make && sudo make install && cd ..
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 #
 # We keep the minimum version in sync with mlpack, otherwise we could have
 # irritating compatibility issues.
-find_package(Armadillo 6.500.0 REQUIRED)
+find_package(Armadillo 8.400.0 REQUIRED)
 include_directories(BEFORE "${ARMADILLO_INCLUDE_DIR}")
 include_directories(BEFORE "${CMAKE_SOURCE_DIR}/include/")