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
be35da0b
Commit
be35da0b
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Trying to fix CI with OpenBLAS
parent
65db1743
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
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
CMakeLists.txt
+17
-16
17 additions, 16 deletions
CMakeLists.txt
FindOpenBLAS.cmake
+12
-6
12 additions, 6 deletions
FindOpenBLAS.cmake
with
30 additions
and
22 deletions
.gitlab-ci.yml
+
1
−
0
View file @
be35da0b
...
@@ -102,6 +102,7 @@ ubuntu_boost_local_static_deps:
...
@@ -102,6 +102,7 @@ ubuntu_boost_local_static_deps:
script
:
script
:
-
cd ../..
-
cd ../..
-
ls external_dependencies/*
-
cd build_scripts/linux
-
cd build_scripts/linux
# - './linux_run_tests.sh'
# - './linux_run_tests.sh'
-
cd ../..
-
cd ../..
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
17
−
16
View file @
be35da0b
...
@@ -86,6 +86,17 @@ if(N_CORES GREATER 1)
...
@@ -86,6 +86,17 @@ if(N_CORES GREATER 1)
endif
()
endif
()
message
(
"Build will be performed on
${
N_CORES
}
cores."
)
message
(
"Build will be performed on
${
N_CORES
}
cores."
)
#---------------#
# Set variables #
#---------------#
set
(
ROOT_DIR
"
${
CMAKE_CURRENT_LIST_DIR
}
"
)
set
(
LROOT_DIR
${
CMAKE_CURRENT_LIST_DIR
}
)
set
(
SRC_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/src
)
set
(
PROJECT_BINARY_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/build
)
set
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY lib
)
set
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib
)
set
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/bin
)
#----------------------------------------#
#----------------------------------------#
# Set prefixes and suffixes of libraries #
# Set prefixes and suffixes of libraries #
#----------------------------------------#
#----------------------------------------#
...
@@ -159,25 +170,15 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
...
@@ -159,25 +170,15 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
include
(
DownloadArmadillo
)
include
(
DownloadArmadillo
)
endif
()
endif
()
#---------------#
# Set variables #
#---------------#
set
(
ROOT_DIR
${
CMAKE_CURRENT_LIST_DIR
}
)
set
(
SRC_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/src
)
set
(
PROJECT_BINARY_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/build
)
set
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY lib
)
set
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib
)
set
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
${
PROJECT_BINARY_DIR
}
/bin
)
#----------------------------------------#
#----------------------------------------#
# Dependencies for the lib4neuro library #
# Dependencies for the lib4neuro library #
#----------------------------------------#
#----------------------------------------#
message
(
"Running CMake in:
${
SRC_DIR
}
${
PROJECT_BINARY_DIR
}
"
)
message
(
"Running CMake in:
${
SRC_DIR
}
${
PROJECT_BINARY_DIR
}
"
)
#
if
(
"
${
BUILD_LIB
}
"
STREQUAL
"no"
)
#
if("${BUILD_LIB}" STREQUAL "no")
#
link_directories
(
${
LIB4NEURO_DIR
}
)
#
link_directories(${LIB4NEURO_DIR})
#
endif
()
#
endif()
add_subdirectory
(
${
SRC_DIR
}
${
PROJECT_BINARY_DIR
}
)
add_subdirectory
(
${
SRC_DIR
}
${
PROJECT_BINARY_DIR
}
)
This diff is collapsed.
Click to expand it.
FindOpenBLAS.cmake
+
12
−
6
View file @
be35da0b
...
@@ -11,9 +11,12 @@ FIND_PATH(
...
@@ -11,9 +11,12 @@ FIND_PATH(
HINTS
HINTS
${
OpenBLAS_INCLUDE_DIRECTORY
}
${
OpenBLAS_INCLUDE_DIRECTORY
}
$ENV{OpenBLAS_INCLUDE_DIRECTORY}
$ENV{OpenBLAS_INCLUDE_DIRECTORY}
/usr/include/
${
ROOT_DIR
}
/external_dependencies/OpenBLAS
/usr/include/x86_64-linux-gnu
/usr
external_dependencies/OpenBLAS
PATH_SUFFIXES
include
include/x86_64-linux-gnu
)
)
FIND_LIBRARY
(
OpenBLAS_LIBRARIES
FIND_LIBRARY
(
OpenBLAS_LIBRARIES
...
@@ -23,9 +26,12 @@ FIND_LIBRARY(OpenBLAS_LIBRARIES
...
@@ -23,9 +26,12 @@ FIND_LIBRARY(OpenBLAS_LIBRARIES
HINTS
HINTS
${
OpenBLAS_LIBRARY_DIRECTORY
}
${
OpenBLAS_LIBRARY_DIRECTORY
}
$ENV{OpenBLAS_LIBRARY_DIRECTORY}
$ENV{OpenBLAS_LIBRARY_DIRECTORY}
/usr/lib
${
ROOT_DIR
}
/external_dependencies/OpenBLAS
/usr/lib/x86_64-linux-gnu
/usr
external_dependencies/OpenBLAS/lib
PATH_SUFFIXES
lib
lib/x86_64-linux-gnu
)
)
# Set OpenBLAS_Found
# Set OpenBLAS_Found
...
...
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