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
51ff8ea7
Commit
51ff8ea7
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
FIX: trying to fix CI...
parent
a53b729c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+9
-6
9 additions, 6 deletions
CMakeLists.txt
DownloadOpenBLAS.cmake
+2
-1
2 additions, 1 deletion
DownloadOpenBLAS.cmake
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
with
12 additions
and
8 deletions
CMakeLists.txt
+
9
−
6
View file @
51ff8ea7
...
@@ -93,8 +93,8 @@ endif()
...
@@ -93,8 +93,8 @@ endif()
set
(
ROOT_DIR
${
CMAKE_CURRENT_LIST_DIR
}
)
set
(
ROOT_DIR
${
CMAKE_CURRENT_LIST_DIR
}
)
set
(
SRC_DIR
${
ROOT_DIR
}
/src
)
set
(
SRC_DIR
${
ROOT_DIR
}
/src
)
set
(
PROJECT_BINARY_DIR
${
ROOT_DIR
}
/build
)
set
(
PROJECT_BINARY_DIR
${
ROOT_DIR
}
/build
)
set
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY lib
)
set
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/
lib
)
set
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib
)
set
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/
lib
)
set
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/bin
)
set
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/bin
)
#----------------------------------------#
#----------------------------------------#
...
@@ -188,18 +188,20 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
...
@@ -188,18 +188,20 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
include
(
DownloadArmadillo
)
include
(
DownloadArmadillo
)
endif
()
endif
()
#------------------------------------------------------#
#------------------------------------------------------
-
#
# Look for linear algebra libraries neede by Armadillo #
# Look for linear algebra libraries neede
d
by Armadillo #
#------------------------------------------------------#
#------------------------------------------------------
-
#
set
(
OpenBLAS_LIBRARIES
""
)
set
(
OpenBLAS_LIBRARIES
""
)
find_package
(
OpenBLAS
)
find_package
(
OpenBLAS
)
option
(
OpenBLAS_LOCAL OFF
)
option
(
OpenBLAS_LOCAL OFF
)
if
(
NOT OpenBLAS_FOUND
)
if
(
NOT OpenBLAS_FOUND
)
if
(
ALLOW_OpenBLAS_DOWNLOAD
)
if
(
ALLOW_OpenBLAS_DOWNLOAD
)
include
(
DownloadOpenBLAS
)
include
(
DownloadOpenBLAS
)
set
(
OpenBLAS_LOCAL ON
)
set
(
OpenBLAS_LOCAL ON
)
set
(
OpenBLAS_LIBRARIES
${
OpenBLAS_LOCAL_PATH
}
)
set
(
OpenBLAS_LIBRARIES
"
${
ROOT_DIR
}
/external_dependencies/OpenBLAS/lib/
${
LIB_PREFIX
}
openblas.
${
LIB_SUFFIX
}
"
)
message
(
"OpenBLAS_LIBRARIES
${
OpenBLAS_LIBRARIES
}
"
)
message
(
"OpenBLAS_LIBRARIES
${
OpenBLAS_LIBRARIES
}
"
)
else
()
else
()
find_package
(
BLAS
)
find_package
(
BLAS
)
...
@@ -208,6 +210,7 @@ if(NOT OpenBLAS_FOUND)
...
@@ -208,6 +210,7 @@ if(NOT OpenBLAS_FOUND)
if
(
NOT BLAS_FOUND AND NOT LAPACK_FOUND
)
if
(
NOT BLAS_FOUND AND NOT LAPACK_FOUND
)
message
(
FATAL_ERROR
"No BLAS or LAPACK libraries are available!"
)
message
(
FATAL_ERROR
"No BLAS or LAPACK libraries are available!"
)
endif
()
endif
()
endif
()
endif
()
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
DownloadOpenBLAS.cmake
+
2
−
1
View file @
51ff8ea7
...
@@ -13,7 +13,8 @@ FetchContent_Declare(
...
@@ -13,7 +13,8 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git
GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git
)
)
#set(FETCHCONTENT_QUIET FALSE)
# See messages during 'git clone'
set
(
FETCHCONTENT_QUIET FALSE
)
if
(
NOT OpenBLAS_POPULATED
)
if
(
NOT OpenBLAS_POPULATED
)
FetchContent_Populate
(
OpenBLAS
)
FetchContent_Populate
(
OpenBLAS
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
1
View file @
51ff8ea7
...
@@ -107,7 +107,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
...
@@ -107,7 +107,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
PRE_BUILD
PRE_BUILD
COMMAND cmake .
COMMAND cmake .
COMMAND cmake --build . -j
${
N_CORES
}
COMMAND cmake --build . -j
${
N_CORES
}
WORKING_DIRECTORY
${
OpenBLAS_LOCAL_PATH
}
WORKING_DIRECTORY
${
ROOT_DIR
}
/external_dependencies/OpenBLAS
COMMENT
"Compiling OpenBLAS"
COMMENT
"Compiling OpenBLAS"
)
)
endif
()
endif
()
...
...
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