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
9b815cf9
Commit
9b815cf9
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Trying to fix CI...
parent
93347264
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
+2
-2
2 additions, 2 deletions
CMakeLists.txt
DownloadOpenBLAS.cmake
+3
-0
3 additions, 0 deletions
DownloadOpenBLAS.cmake
src/CMakeLists.txt
+11
-0
11 additions, 0 deletions
src/CMakeLists.txt
with
16 additions
and
2 deletions
CMakeLists.txt
+
2
−
2
View file @
9b815cf9
...
@@ -155,8 +155,8 @@ endif()
...
@@ -155,8 +155,8 @@ endif()
if
(
NOT WIN32
)
if
(
NOT WIN32
)
message
(
"Checking Armadillo dependencies"
)
message
(
"Checking Armadillo dependencies"
)
find_package
(
LAPACK
)
#
find_package(LAPACK)
find_package
(
BLAS
)
#
find_package(BLAS)
set
(
ARMA_LIBS
""
)
set
(
ARMA_LIBS
""
)
if
(
NOT LAPACK_FOUND AND NOT BLAS_FOUND
)
if
(
NOT LAPACK_FOUND AND NOT BLAS_FOUND
)
...
...
This diff is collapsed.
Click to expand it.
DownloadOpenBLAS.cmake
+
3
−
0
View file @
9b815cf9
...
@@ -42,6 +42,9 @@ if(NOT rv STREQUAL "0")
...
@@ -42,6 +42,9 @@ if(NOT rv STREQUAL "0")
message
(
"OpenBLAS build: cmake --build:
${
rv
}
"
)
message
(
"OpenBLAS build: cmake --build:
${
rv
}
"
)
endif
()
endif
()
set_target_properties
(
openblas PROPERTIES LINK_FLAGS
)
add_subdirectory
(
${
OPENBLAS_LOCAL_PATH
}
)
find_package
(
OpenBLAS
)
find_package
(
OpenBLAS
)
if
(
NOT OpenBLAS_FOUND
)
if
(
NOT OpenBLAS_FOUND
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
11
−
0
View file @
9b815cf9
...
@@ -69,6 +69,15 @@ if ("${BUILD_LIB}" STREQUAL "yes")
...
@@ -69,6 +69,15 @@ if ("${BUILD_LIB}" STREQUAL "yes")
set
(
CXX_FILESYSTEM_LIB
"stdc++fs"
)
set
(
CXX_FILESYSTEM_LIB
"stdc++fs"
)
endif
()
endif
()
# Detect Threading library
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
find_package
(
Threads REQUIRED
)
set
(
GFORT
""
)
if
(
NOT WIN32
)
set
(
GFORT gfortran
)
endif
()
target_link_libraries
(
target_link_libraries
(
lib4neuro
lib4neuro
...
@@ -77,6 +86,8 @@ if ("${BUILD_LIB}" STREQUAL "yes")
...
@@ -77,6 +86,8 @@ if ("${BUILD_LIB}" STREQUAL "yes")
${
Boost_LIBRARIES
}
${
Boost_LIBRARIES
}
${
CXX_FILESYSTEM_LIB
}
${
CXX_FILESYSTEM_LIB
}
armadillo
armadillo
Threads::Threads
${
GFORT
}
)
)
target_include_directories
(
target_include_directories
(
...
...
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