Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lib4neuro
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MolDyn
lib4neuro
Commits
cf62d33a
Commit
cf62d33a
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
Trying to fix CI...
parent
148fc8b2
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
FindOpenBLAS.cmake
+12
-10
12 additions, 10 deletions
FindOpenBLAS.cmake
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
with
16 additions
and
14 deletions
CMakeLists.txt
+
3
−
3
View file @
cf62d33a
...
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
FindOpenBLAS.cmake
+
12
−
10
View file @
cf62d33a
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
1
View file @
cf62d33a
...
...
@@ -63,7 +63,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
NormalizationStrategy/NormalizationStrategy.cpp
LearningMethods/GradientDescentSingleItem.cpp
LearningMethods/LearningSequence.cpp
LearningMethods/GradientDescentBB.cpp
LearningMethods/GradientDescentBB.cpp
6
)
# FileSystem C++ library - has to be linked manually in GCC-8
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment