Skip to content
Snippets Groups Projects
Commit cf62d33a authored by Martin Beseda's avatar Martin Beseda
Browse files

Trying to fix CI...

parent 148fc8b2
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment