Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
d1df2d98
Commit
d1df2d98
authored
Dec 02, 2016
by
Sebastian Woelke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add hwloc to cmake build process
parent
4bad2c0f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
95 additions
and
1 deletion
+95
-1
CMakeLists.txt
CMakeLists.txt
+17
-1
benchmarks
benchmarks
+1
-0
cmake/FindHwloc.cmake
cmake/FindHwloc.cmake
+69
-0
cmake/build_config.hpp.in
cmake/build_config.hpp.in
+4
-0
configure
configure
+4
-0
No files found.
CMakeLists.txt
View file @
d1df2d98
...
@@ -81,6 +81,10 @@ if(NOT CAF_NO_OPENSSL)
...
@@ -81,6 +81,10 @@ if(NOT CAF_NO_OPENSSL)
set
(
CAF_NO_OPENSSL no
)
set
(
CAF_NO_OPENSSL no
)
endif
()
endif
()
if
(
NOT CAF_NO_HWLOC
)
set
(
CAF_NO_HWLOC no
)
endif
()
if
(
NOT CAF_NO_PYTHON
)
if
(
NOT CAF_NO_PYTHON
)
set
(
CAF_NO_PYTHON no
)
set
(
CAF_NO_PYTHON no
)
endif
()
endif
()
...
@@ -402,7 +406,7 @@ add_custom_target(uninstall
...
@@ -402,7 +406,7 @@ add_custom_target(uninstall
################################################################################
################################################################################
# set inclue paths for subprojects #
# set inclu
d
e paths for subprojects #
################################################################################
################################################################################
# path to caf core & io headers
# path to caf core & io headers
...
@@ -525,6 +529,16 @@ if(NOT CAF_NO_OPENCL)
...
@@ -525,6 +529,16 @@ if(NOT CAF_NO_OPENCL)
endif
()
endif
()
endif
()
endif
()
# load hwloc library if not told otherwise
if
(
NOT CAF_NO_HWLOC
)
find_package
(
Hwloc
)
if
(
Hwloc_FOUND
)
add_optional_caf_lib
(
hwloc
)
else
()
set
(
CAF_NO_HWLOC yes
)
endif
()
endif
()
# build Python binding if not being told otherwise
# build Python binding if not being told otherwise
if
(
NOT CAF_NO_PYTHON AND EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/libcaf_python/CMakeLists.txt"
)
if
(
NOT CAF_NO_PYTHON AND EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/libcaf_python/CMakeLists.txt"
)
add_subdirectory
(
libcaf_python
)
add_subdirectory
(
libcaf_python
)
...
@@ -705,6 +719,7 @@ invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT)
...
@@ -705,6 +719,7 @@ invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT)
invertYesNo
(
CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS
)
invertYesNo
(
CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS
)
invertYesNo
(
CAF_NO_OPENCL CAF_BUILD_OPENCL
)
invertYesNo
(
CAF_NO_OPENCL CAF_BUILD_OPENCL
)
invertYesNo
(
CAF_NO_OPENSSL CAF_BUILD_OPENSSL
)
invertYesNo
(
CAF_NO_OPENSSL CAF_BUILD_OPENSSL
)
invertYesNo
(
CAF_NO_HWLOC CAF_BUILD_HWLOC
)
invertYesNo
(
CAF_NO_PYTHON CAF_BUILD_PYTHON
)
invertYesNo
(
CAF_NO_PYTHON CAF_BUILD_PYTHON
)
# collect all compiler flags
# collect all compiler flags
string
(
TOUPPER
"
${
CMAKE_BUILD_TYPE
}
"
UPPER_BUILD_TYPE
)
string
(
TOUPPER
"
${
CMAKE_BUILD_TYPE
}
"
UPPER_BUILD_TYPE
)
...
@@ -731,6 +746,7 @@ if(NOT CAF_NO_SUMMARY)
...
@@ -731,6 +746,7 @@ if(NOT CAF_NO_SUMMARY)
"
\n
Build benchmarks:
${
CAF_BUILD_BENCHMARKS
}
"
"
\n
Build benchmarks:
${
CAF_BUILD_BENCHMARKS
}
"
"
\n
Build OpenCL:
${
CAF_BUILD_OPENCL
}
"
"
\n
Build OpenCL:
${
CAF_BUILD_OPENCL
}
"
"
\n
Build OpenSSL:
${
CAF_BUILD_OPENSSL
}
"
"
\n
Build OpenSSL:
${
CAF_BUILD_OPENSSL
}
"
"
\n
Build hwloc:
${
CAF_BUILD_HWLOC
}
"
"
\n
Build Python:
${
CAF_BUILD_PYTHON
}
"
"
\n
Build Python:
${
CAF_BUILD_PYTHON
}
"
"
\n
"
"
\n
"
"
\n
CXX:
${
CMAKE_CXX_COMPILER
}
"
"
\n
CXX:
${
CMAKE_CXX_COMPILER
}
"
...
...
benchmarks
@
c2cdbbb3
Subproject commit c2cdbbb3824f405eb06ff9413416cacac66f7534
cmake/FindHwloc.cmake
0 → 100644
View file @
d1df2d98
# - Try to find hwloc
# Once done this will define
#
# Hwloc_FOUND - system has Hwloc
# Hwloc_INCLUDE_DIRS - the Hwloc include directory
# Hwloc_LIBRARIES - link these to use Hwloc
# Hwloc_VERSION - version
#
# WIN32 should work, but is untested
if
(
WIN32
)
find_path
(
Hwloc_INCLUDE_DIRS
NAMES
hwloc.h
PATHS
ENV
"PROGRAMFILES(X86)"
ENV HWLOC_ROOT
PATH_SUFFIXES
include
)
find_library
(
Hwloc_LIBRARY
NAMES
libhwloc.lib
PATHS
ENV
"PROGRAMFILES(X86)"
ENV HWLOC_ROOT
PATH_SUFFIXES
lib
)
find_program
(
HWLOC_INFO_EXECUTABLE
NAMES
hwloc-info
PATHS
ENV HWLOC_ROOT
PATH_SUFFIXES
bin
)
if
(
HWLOC_INFO_EXECUTABLE
)
execute_process
(
COMMAND
${
HWLOC_INFO_EXECUTABLE
}
"--version"
OUTPUT_VARIABLE HWLOC_VERSION_LINE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string
(
REGEX MATCH
"([0-9]+.[0-9]+)$"
Hwloc_VERSION
"
${
HWLOC_VERSION_LINE
}
"
)
unset
(
HWLOC_VERSION_LINE
)
endif
()
set
(
Hwloc_LIBRARIES
${
Hwloc_LIBRARY
}
)
set
(
Hwloc_INCLUDE_DIRS
${
Hwloc_INCLUDE_DIR
}
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Hwloc
FOUND_VAR Hwloc_FOUND
REQUIRED_VARS Hwloc_LIBRARY Hwloc_INCLUDE_DIR
VERSION_VAR Hwloc_VERSION
)
mark_as_advanced
(
Hwloc_INCLUDE_DIR
Hwloc_LIBRARY
)
else
()
find_package
(
PkgConfig
)
pkg_check_modules
(
Hwloc QUIET hwloc
)
if
(
Hwloc_FOUND
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Hwloc DEFAULT_MSG Hwloc_LIBRARIES
)
message
(
STATUS
"Found hwloc version
${
Hwloc_VERSION
}
"
)
endif
()
endif
()
cmake/build_config.hpp.in
View file @
d1df2d98
...
@@ -42,4 +42,8 @@
...
@@ -42,4 +42,8 @@
#define CAF_NO_EXCEPTIONS
#define CAF_NO_EXCEPTIONS
#endif
#endif
#if @CAF_NO_HWLOC@ != -1
#define CAF_NO_HWLOC
#endif
#endif //CAF_DETAIL_BUILD_CONFIG_HPP
#endif //CAF_DETAIL_BUILD_CONFIG_HPP
configure
View file @
d1df2d98
...
@@ -67,6 +67,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
...
@@ -67,6 +67,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--no-unit-tests build without unit tests
--no-unit-tests build without unit tests
--no-opencl build without OpenCL module
--no-opencl build without OpenCL module
--no-openssl build without OpenSSL module
--no-openssl build without OpenSSL module
--no-hwloc build without NUMA related optimizations
--no-benchmarks build without benchmarks
--no-benchmarks build without benchmarks
--no-tools build without CAF tools such as caf-run
--no-tools build without CAF tools such as caf-run
--no-io build without I/O module
--no-io build without I/O module
...
@@ -347,6 +348,9 @@ while [ $# -ne 0 ]; do
...
@@ -347,6 +348,9 @@ while [ $# -ne 0 ]; do
--no-openssl
)
--no-openssl
)
append_cache_entry CAF_NO_OPENSSL BOOL
yes
append_cache_entry CAF_NO_OPENSSL BOOL
yes
;;
;;
--no-hwloc
)
append_cache_entry CAF_NO_HWLOC BOOL
yes
;;
--build-static
)
--build-static
)
append_cache_entry CAF_BUILD_STATIC BOOL
yes
append_cache_entry CAF_BUILD_STATIC BOOL
yes
;;
;;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment