From cf62d33a1770ead619b818380ff300c52cfd454b Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Thu, 21 Feb 2019 15:53:41 +0100
Subject: [PATCH] Trying to fix CI...
---
CMakeLists.txt | 6 +++---
FindOpenBLAS.cmake | 22 ++++++++++++----------
src/CMakeLists.txt | 2 +-
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4f97f5b..125bc37c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,15 +155,15 @@ endif()
if(NOT WIN32)
message("Checking Armadillo dependencies")
-# find_package(LAPACK)
-# find_package(BLAS)
+ find_package(LAPACK)
+ find_package(BLAS)
set(ARMA_LIBS "")
if(NOT LAPACK_FOUND AND NOT BLAS_FOUND)
find_package(OpenBLAS)
if(NOT OpenBLAS_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
# Download and build OpenBLAS locally
- message("Nor LAPACK nor BLAS were found - OpenBLAS will be downloaded and built.")
+ message("Nor LAPACK nor BLAS nor OpenBLAS were found - OpenBLAS will be downloaded and built.")
include(DownloadOpenBLAS)
endif()
endif()
diff --git a/FindOpenBLAS.cmake b/FindOpenBLAS.cmake
index 9f224089..f35f61e7 100644
--- a/FindOpenBLAS.cmake
+++ b/FindOpenBLAS.cmake
@@ -6,7 +6,7 @@ FIND_PATH(
OpenBLAS_INCLUDE_DIR
NAMES
- cblas.h
+ cblas.h
HINTS
${OpenBLAS_INCLUDE_DIRECTORY}
@@ -14,9 +14,10 @@ FIND_PATH(
${ROOT_DIR}/external_dependencies/OpenBLAS
/usr
- PATH_SUFFIXES
+ PATH_SUFFIXES
include
include/x86_64-linux-gnu
+ include/OpenBLAS
)
#IF(${OpenBLAS_INCLUDE_DIR} MATCHES "^.*external_dependencies.*$")
@@ -37,18 +38,19 @@ FIND_PATH(
OpenBLAS_LIBRARIES
NAMES
- ${LIB_PREFIX}openblas.${LIB_SUFFIX}
+ ${LIB_PREFIX}openblas.${LIB_SUFFIX}
HINTS
- ${OpenBLAS_LIBRARY_DIRECTORY}
- $ENV{OpenBLAS_LIBRARY_DIRECTORY}
- ${ROOT_DIR}/external_dependencies/OpenBLAS
- /usr
+ ${OpenBLAS_LIBRARY_DIRECTORY}
+ $ENV{OpenBLAS_LIBRARY_DIRECTORY}
+ ${ROOT_DIR}/external_dependencies/OpenBLAS
+ /usr
PATH_SUFFIXES
- lib
- lib/x86_64-linux-gnu
- local
+ lib
+ lib/x86_64-linux-gnu
+ local
+ include/OpenBLAS/lib
)
# Set OpenBLAS_Found
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45920a99..ec6e318e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -63,7 +63,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
NormalizationStrategy/NormalizationStrategy.cpp
LearningMethods/GradientDescentSingleItem.cpp
LearningMethods/LearningSequence.cpp
- LearningMethods/GradientDescentBB.cpp
+ LearningMethods/GradientDescentBB.cpp6
)
# FileSystem C++ library - has to be linked manually in GCC-8
--
GitLab