Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
7abd6b1b
Commit
7abd6b1b
authored
Nov 10, 2016
by
Praetorius, Simon
Browse files
cleanup of debian/control and zoltan and libgpng cmake configuration updated
parent
fb4a2b0b
Changes
15
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
7abd6b1b
...
@@ -19,7 +19,7 @@ build:9-debug-gcc:
...
@@ -19,7 +19,7 @@ build:9-debug-gcc:
name
:
"
$CI_BUILD_NAME"
name
:
"
$CI_BUILD_NAME"
expire_in
:
6 hrs
expire_in
:
6 hrs
only
:
only
:
-
develop
-
master
build:9-release-gcc:
build:9-release-gcc:
stage
:
build
stage
:
build
...
@@ -31,7 +31,7 @@ build:9-release-gcc:
...
@@ -31,7 +31,7 @@ build:9-release-gcc:
name
:
"
$CI_BUILD_NAME"
name
:
"
$CI_BUILD_NAME"
expire_in
:
6 hrs
expire_in
:
6 hrs
only
:
only
:
-
develop
-
master
build:9-parallel-debug-gcc:
build:9-parallel-debug-gcc:
stage
:
build
stage
:
build
...
@@ -43,7 +43,7 @@ build:9-parallel-debug-gcc:
...
@@ -43,7 +43,7 @@ build:9-parallel-debug-gcc:
name
:
"
$CI_BUILD_NAME"
name
:
"
$CI_BUILD_NAME"
expire_in
:
6 hrs
expire_in
:
6 hrs
only
:
only
:
-
develop
-
master
build:9-parallel-release-gcc:
build:9-parallel-release-gcc:
stage
:
build
stage
:
build
...
@@ -55,7 +55,7 @@ build:9-parallel-release-gcc:
...
@@ -55,7 +55,7 @@ build:9-parallel-release-gcc:
name
:
"
$CI_BUILD_NAME"
name
:
"
$CI_BUILD_NAME"
expire_in
:
6 hrs
expire_in
:
6 hrs
only
:
only
:
-
develop
-
master
# compile the demos
# compile the demos
...
@@ -66,7 +66,7 @@ demo:9-debug-gcc:
...
@@ -66,7 +66,7 @@ demo:9-debug-gcc:
dependencies
:
dependencies
:
-
build:9-debug-gcc
-
build:9-debug-gcc
only
:
only
:
-
develop
-
master
demo:9-release-gcc:
demo:9-release-gcc:
stage
:
demo
stage
:
demo
...
@@ -75,7 +75,7 @@ demo:9-release-gcc:
...
@@ -75,7 +75,7 @@ demo:9-release-gcc:
dependencies
:
dependencies
:
-
build:9-release-gcc
-
build:9-release-gcc
only
:
only
:
-
develop
-
master
demo:9-parallel-debug-gcc:
demo:9-parallel-debug-gcc:
stage
:
demo
stage
:
demo
...
@@ -84,7 +84,7 @@ demo:9-parallel-debug-gcc:
...
@@ -84,7 +84,7 @@ demo:9-parallel-debug-gcc:
dependencies
:
dependencies
:
-
build:9-parallel-debug-gcc
-
build:9-parallel-debug-gcc
only
:
only
:
-
develop
-
master
demo:9-parallel-release-gcc:
demo:9-parallel-release-gcc:
stage
:
demo
stage
:
demo
...
@@ -93,7 +93,7 @@ demo:9-parallel-release-gcc:
...
@@ -93,7 +93,7 @@ demo:9-parallel-release-gcc:
dependencies
:
dependencies
:
-
build:9-parallel-release-gcc
-
build:9-parallel-release-gcc
only
:
only
:
-
develop
-
master
# compiel and run the tests
# compiel and run the tests
...
@@ -104,7 +104,7 @@ test:9-debug-gcc:
...
@@ -104,7 +104,7 @@ test:9-debug-gcc:
dependencies
:
dependencies
:
-
build:9-debug-gcc
-
build:9-debug-gcc
only
:
only
:
-
develop
-
master
test:9-release-gcc:
test:9-release-gcc:
stage
:
test
stage
:
test
...
@@ -113,7 +113,7 @@ test:9-release-gcc:
...
@@ -113,7 +113,7 @@ test:9-release-gcc:
dependencies
:
dependencies
:
-
build:9-release-gcc
-
build:9-release-gcc
only
:
only
:
-
develop
-
master
test:9-parallel-debug-gcc:
test:9-parallel-debug-gcc:
stage
:
test
stage
:
test
...
@@ -122,7 +122,7 @@ test:9-parallel-debug-gcc:
...
@@ -122,7 +122,7 @@ test:9-parallel-debug-gcc:
dependencies
:
dependencies
:
-
build:9-parallel-debug-gcc
-
build:9-parallel-debug-gcc
only
:
only
:
-
develop
-
master
test:9-parallel-release-gcc:
test:9-parallel-release-gcc:
stage
:
test
stage
:
test
...
@@ -131,47 +131,20 @@ test:9-parallel-release-gcc:
...
@@ -131,47 +131,20 @@ test:9-parallel-release-gcc:
dependencies
:
dependencies
:
-
build:9-parallel-release-gcc
-
build:9-parallel-release-gcc
only
:
only
:
-
develop
# compiel and run the tests
package:9-debug-gcc:
stage
:
package
script
:
-
cmake -DCONFIG=Debug -DCOMPONENT=SEQUENTIAL -P tools/packaging/debian/create_package.cmake
artifacts
:
paths
:
-
debian_package/amdis-dbg/amdis*.deb
only
:
-
master
-
master
package:9-release-gcc:
stage
:
package
script
:
-
cmake -DCONFIG=Release -DCOMPONENT=SEQUENTIAL -P tools/packaging/debian/create_package.cmake
artifacts
:
paths
:
-
debian_package/amdis/amdis*.deb
only
:
-
master
package:9-parallel-debug-gcc:
# compiel and run the tests
package:xenial:
stage
:
package
stage
:
package
script
:
script
:
-
cmake -DCONFIG=Debug -DCOMPONENT=PARALLEL -P tools/packaging/debian/create_package.cmake
-
cmake -DDISTRIBUTION=xenial -P tools/packaging/debian/create_package.cmake
artifacts
:
paths
:
-
debian_package/amdis-dbg/amdis-par-dbg*.deb
only
:
only
:
-
master
-
master
package:
9-parallel-release-gcc
:
package:
yakkety
:
stage
:
package
stage
:
package
script
:
script
:
-
cmake -DCONFIG=Release -DCOMPONENT=PARALLEL -P tools/packaging/debian/create_package.cmake
-
cmake -DDISTRIBUTION=yakkety -P tools/packaging/debian/create_package.cmake
artifacts
:
paths
:
-
debian_package/amdis-dbg/amdis-par*.deb
only
:
only
:
-
master
-
master
AMDiS/cmake/CMakeLists.txt
View file @
7abd6b1b
...
@@ -243,6 +243,7 @@ endforeach ()
...
@@ -243,6 +243,7 @@ endforeach ()
file
(
GLOB CMAKE_MACROS
"
${
BASE_DIR
}
/cmake/enable_*.cmake"
)
file
(
GLOB CMAKE_MACROS
"
${
BASE_DIR
}
/cmake/enable_*.cmake"
)
install
(
FILES
${
CMAKE_MACROS
}
DESTINATION share/amdis/
)
install
(
FILES
${
CMAKE_MACROS
}
DESTINATION share/amdis/
)
install
(
FILES
${
BASE_DIR
}
/cmake3/ZoltanConfig.cmake DESTINATION share/amdis/
)
install
(
DIRECTORY
${
BASE_DIR
}
/lib/mtl4/ DESTINATION include/amdis/mtl4/
install
(
DIRECTORY
${
BASE_DIR
}
/lib/mtl4/ DESTINATION include/amdis/mtl4/
FILES_MATCHING PATTERN
"*.hpp"
FILES_MATCHING PATTERN
"*.hpp"
...
...
AMDiS/cmake/ZoltanConfig.cmake
0 → 100644
View file @
7abd6b1b
macro
(
parse_zoltan_makefile _FILE_ _LIBS_
)
file
(
STRINGS
${
_FILE_
}
ZOLTAN_MAKEFILE_LINE REGEX
"ZOLTAN_EXTRA_LIBS"
)
get_filename_component
(
ZOLTAN_MAKEFILE_DIR
"
${
ZOLTAN_MAKEFILE
}
"
PATH CACHE
)
string
(
STRIP
"
${
ZOLTAN_MAKEFILE_LINE
}
"
LINE
)
if
(
"
${
LINE
}
"
MATCHES
"^ZOLTAN_EXTRA_LIBS[ ]*=[ ]*([a-zA-Z0-9_/. -]+)$"
)
string
(
REGEX REPLACE
" "
";"
ZOLTAN_EXTRA_LIBS_LIST
"
${
CMAKE_MATCH_1
}
"
)
set
(
ZOLTAN_LIB_DIRS
""
)
foreach
(
LIBS
${
ZOLTAN_EXTRA_LIBS_LIST
}
)
string
(
STRIP
"
${
LIBS
}
"
LIBS
)
string
(
SUBSTRING
"
${
LIBS
}
"
0 2 LIB_PREFIX
)
string
(
SUBSTRING
"
${
LIBS
}
"
2 -1 LIB_NAME
)
if
(
"
${
LIB_PREFIX
}
"
STREQUAL
"-L"
)
list
(
APPEND ZOLTAN_LIB_DIRS
${
LIB_NAME
}
)
elseif
(
"
${
LIB_PREFIX
}
"
STREQUAL
"-l"
)
find_library
(
_ZOLTAN_EXTERN_LIB
${
LIB_NAME
}
HINTS
${
ZOLTAN_LIB_DIRS
}
)
if
(
NOT _ZOLTAN_EXTERN_LIB
)
message
(
FATAL_ERROR
"Could not find library
\"
${
LIB_NAME
}
\"
in directories
${
ZOLTAN_LIB_DIRS
}
!"
)
else
()
list
(
APPEND
${
_LIBS_
}
${
_ZOLTAN_EXTERN_LIB
}
)
endif
()
unset
(
_ZOLTAN_EXTERN_LIB CACHE
)
else
()
message
(
WARNING
"Unknown link parameter
\"
${
LIBS
}
\"
"
)
endif
()
endforeach
(
LIBS
)
endif
()
endmacro
(
parse_zoltan_makefile
)
AMDiS/cmake/enable_png.cmake
View file @
7abd6b1b
...
@@ -9,12 +9,21 @@ macro(enable_png _FLAGS_ _INC_DIRS_ _LIBS_)
...
@@ -9,12 +9,21 @@ macro(enable_png _FLAGS_ _INC_DIRS_ _LIBS_)
HINTS ENV CPATH /usr/include
HINTS ENV CPATH /usr/include
DOC
"headerfile png.h for PNG-READER"
)
DOC
"headerfile png.h for PNG-READER"
)
if
(
_PNG_H
)
if
(
NOT _PNG_H
)
get_filename_component
(
PNG_PATH
${
_PNG_H
}
PATH
)
list
(
APPEND
${
_INC_DIRS_
}
${
PNG_PATH
}
)
else
()
message
(
FATAL_ERROR
"Could not find the PNG header png.h."
)
message
(
FATAL_ERROR
"Could not find the PNG header png.h."
)
endif
()
else
()
file
(
STRINGS
${
_PNG_H
}
PNG_VERSION_LINE REGEX
"#define PNG_LIBPNG_VER_STRING"
)
string
(
REGEX MATCH
"
\"
([0-9]+[.][0-9]+([.][0-9]+)?)
\"
"
PNG_VERSION_LINE
${
PNG_VERSION_LINE
}
)
set
(
PNG_VERSION
${
CMAKE_MATCH_1
}
)
message
(
STATUS
"Libpng version:
${
PNG_VERSION
}
"
)
if
(
NOT PNG_VERSION VERSION_LESS
"1.6"
OR NOT PNG_VERSION VERSION_GREATER
"1.2"
)
message
(
FATAL_ERROR
"Incompatible libpng version. Requires 1.2.x"
)
endif
()
endif
()
get_filename_component
(
PNG_PATH
${
_PNG_H
}
PATH
)
list
(
APPEND
${
_INC_DIRS_
}
${
PNG_PATH
}
)
if
(
LINK_EXECUTABLE
)
if
(
LINK_EXECUTABLE
)
find_library
(
_PNG_LIB png
find_library
(
_PNG_LIB png
...
...
AMDiS/cmake/enable_zoltan.cmake
View file @
7abd6b1b
include
(
ZoltanConfig
)
macro
(
enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_
)
macro
(
enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_
)
if
(
${
ARGC
}
GREATER 3
)
if
(
${
ARGC
}
GREATER 3
)
set
(
LINK_EXECUTABLE ON
)
set
(
LINK_EXECUTABLE ON
)
...
@@ -5,22 +6,55 @@ macro(enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_)
...
@@ -5,22 +6,55 @@ macro(enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_)
set
(
LINK_EXECUTABLE OFF
)
set
(
LINK_EXECUTABLE OFF
)
endif
()
endif
()
find_file
(
ZOLTAN_HEADER_FILE
"zoltan_cpp.h"
HINTS
${
ZOLTAN_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
)
find_package
(
Zoltan QUIET
)
if
(
ZOLTAN_HEADER_FILE
)
if
(
Zoltan_FOUND
)
get_filename_component
(
ZOLTAN_HEADER_DIR
"
${
ZOLTAN_HEADER_FILE
}
"
PATH CACHE
)
find_file
(
ZOLTAN_HEADER_FILE
"zoltan.h"
PATHS
${
Zoltan_INCLUDE_DIRS
}
)
list
(
APPEND
${
_INC_DIRS_
}
${
ZOLTAN_HEADER_DIR
}
)
list
(
APPEND
${
_INC_DIRS_
}
${
Zoltan_INCLUDE_DIRS
}
)
else
()
message
(
FATAL_ERROR
"Could not find Zoltan include file 'zoltan_cpp.h'!"
)
if
(
LINK_EXECUTABLE
)
endif
(
ZOLTAN_HEADER_FILE
)
foreach
(
LIB_NAME
${
Zoltan_LIBRARIES
}
)
find_library
(
_ZOLTAN_LIB
${
LIB_NAME
}
HINTS
${
Zoltan_LIBRARY_DIRS
}
)
if
(
NOT _ZOLTAN_LIB
)
message
(
FATAL_ERROR
"Could not find library
\"
${
LIB_NAME
}
\"
in directories
${
Zoltan_LIBRARY_DIRS
}
!"
)
else
()
list
(
APPEND
${
_LIBS_
}
${
_ZOLTAN_LIB
}
)
endif
()
unset
(
_ZOLTAN_LIB CACHE
)
endforeach
(
LIB_NAME
)
endif
(
LINK_EXECUTABLE
)
else
(
Zoltan_FOUND
)
find_file
(
ZOLTAN_HEADER_FILE
"zoltan.h"
HINTS
${
ZOLTAN_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
)
if
(
ZOLTAN_HEADER_FILE
)
get_filename_component
(
ZOLTAN_HEADER_DIR
"
${
ZOLTAN_HEADER_FILE
}
"
PATH CACHE
)
list
(
APPEND
${
_INC_DIRS_
}
${
ZOLTAN_HEADER_DIR
}
)
else
()
message
(
FATAL_ERROR
"Could not find Zoltan include file 'zoltan_cpp.h'!"
)
endif
(
ZOLTAN_HEADER_FILE
)
if
(
LINK_EXECUTABLE
)
find_library
(
ZOLTAN_LIB zoltan
HINTS ENV LIBRARY_PATH DOC
"Full path to the zoltan library"
)
if
(
NOT ZOLTAN_LIB
)
message
(
FATAL_ERROR
"Could not find zoltan library!"
)
endif
(
NOT ZOLTAN_LIB
)
list
(
APPEND
${
_LIBS_
}
${
ZOLTAN_LIB
}
)
if
(
LINK_EXECUTABLE
)
find_file
(
ZOLTAN_CONFIG_FILE
"Makefile.export.zoltan"
HINTS
${
ZOLTAN_HEADER_DIR
}
)
find_library
(
ZOLTAN_LIB zoltan
if
(
ZOLTAN_CONFIG_FILE
)
HINTS ENV LIBRARY_PATH DOC
"Full path to the zoltan library"
)
parse_zoltan_makefile
(
${
ZOLTAN_CONFIG_FILE
}
${
_TARGET_
}
${
_SCOPE_
}
)
if
(
NOT ZOLTAN_LIB
)
else
(
)
message
(
FATAL_ERROR
"Could not find zoltan library
!"
)
message
(
WARNING
"Zoltan configuration file Makefile.export.zoltan not found
!"
)
endif
(
NOT ZOLTAN_LIB
)
endif
()
list
(
APPEND
${
_LIBS_
}
${
ZOLTAN_LIB
}
)
endif
(
LINK_EXECUTABLE
)
endif
(
LINK_EXECUTABLE
)
endif
(
Zoltan_FOUND
)
if
(
ZOLTAN_HEADER_FILE
)
file
(
STRINGS
${
ZOLTAN_HEADER_FILE
}
ZOLTAN_VERSION_LINE REGEX
"#define ZOLTAN_VERSION_NUMBER"
)
string
(
REGEX MATCH
"([0-9]+[.][0-9]+)"
ZOLTAN_VERSION_REGEX
${
ZOLTAN_VERSION_LINE
}
)
set
(
ZOLTAN_VERSION
${
CMAKE_MATCH_1
}
)
unset
(
ZOLTAN_HEADER_FILE CACHE
)
message
(
STATUS
"Zoltan version:
${
ZOLTAN_VERSION
}
"
)
endif
(
ZOLTAN_HEADER_FILE
)
list
(
APPEND
${
_FLAGS_
}
"-DHAVE_ZOLTAN=1"
)
list
(
APPEND
${
_FLAGS_
}
"-DHAVE_ZOLTAN=1"
)
endmacro
(
enable_zoltan
)
endmacro
(
enable_zoltan
)
AMDiS/cmake3/AMDIS.cmake.in
View file @
7abd6b1b
...
@@ -181,6 +181,9 @@ endif (AMDIS_HAS_PARALLEL_DOMAIN)
...
@@ -181,6 +181,9 @@ endif (AMDIS_HAS_PARALLEL_DOMAIN)
# Zoltan library
# Zoltan library
# --------------
# --------------
if (AMDIS_NEED_ZOLTAN)
if (AMDIS_NEED_ZOLTAN)
if (NOT DEFINED ZOLTAN_DIR)
set(ZOLTAN_DIR "@ZOLTAN_DIR@")
endif ()
target_enable_zoltan(amdis_base INTERFACE ON)
target_enable_zoltan(amdis_base INTERFACE ON)
endif ()
endif ()
...
...
AMDiS/cmake3/CMakeLists.txt
View file @
7abd6b1b
...
@@ -210,6 +210,7 @@ endforeach ()
...
@@ -210,6 +210,7 @@ endforeach ()
file
(
GLOB CMAKE_MACROS
"
${
BASE_DIR
}
/cmake3/target_enable_*.cmake"
)
file
(
GLOB CMAKE_MACROS
"
${
BASE_DIR
}
/cmake3/target_enable_*.cmake"
)
install
(
FILES
${
CMAKE_MACROS
}
DESTINATION share/amdis/
)
install
(
FILES
${
CMAKE_MACROS
}
DESTINATION share/amdis/
)
install
(
FILES
${
BASE_DIR
}
/cmake3/ZoltanConfig.cmake DESTINATION share/amdis/
)
install
(
DIRECTORY
${
BASE_DIR
}
/lib/mtl4/ DESTINATION include/amdis/mtl4/
install
(
DIRECTORY
${
BASE_DIR
}
/lib/mtl4/ DESTINATION include/amdis/mtl4/
FILES_MATCHING PATTERN
"*.hpp"
FILES_MATCHING PATTERN
"*.hpp"
...
...
AMDiS/cmake3/ZoltanConfig.cmake
0 → 100644
View file @
7abd6b1b
macro
(
parse_zoltan_makefile _FILE_ _TARGET_ _SCOPE_
)
file
(
STRINGS
${
_FILE_
}
ZOLTAN_MAKEFILE_LINE REGEX
"ZOLTAN_EXTRA_LIBS"
)
get_filename_component
(
ZOLTAN_MAKEFILE_DIR
"
${
ZOLTAN_MAKEFILE
}
"
PATH CACHE
)
string
(
STRIP
"
${
ZOLTAN_MAKEFILE_LINE
}
"
LINE
)
if
(
"
${
LINE
}
"
MATCHES
"^ZOLTAN_EXTRA_LIBS[ ]*=[ ]*([a-zA-Z0-9_/. -]+)$"
)
string
(
REGEX REPLACE
" "
";"
ZOLTAN_EXTRA_LIBS_LIST
"
${
CMAKE_MATCH_1
}
"
)
set
(
ZOLTAN_LIB_DIRS
""
)
foreach
(
LIBS
${
ZOLTAN_EXTRA_LIBS_LIST
}
)
string
(
STRIP
"
${
LIBS
}
"
LIBS
)
string
(
SUBSTRING
"
${
LIBS
}
"
0 2 LIB_PREFIX
)
string
(
SUBSTRING
"
${
LIBS
}
"
2 -1 LIB_NAME
)
if
(
"
${
LIB_PREFIX
}
"
STREQUAL
"-L"
)
list
(
APPEND ZOLTAN_LIB_DIRS
${
LIB_NAME
}
)
elseif
(
"
${
LIB_PREFIX
}
"
STREQUAL
"-l"
)
find_library
(
_ZOLTAN_EXTERN_LIB
${
LIB_NAME
}
HINTS
${
ZOLTAN_LIB_DIRS
}
)
if
(
NOT _ZOLTAN_EXTERN_LIB
)
message
(
FATAL_ERROR
"Could not find library
\"
${
LIB_NAME
}
\"
in directories
${
ZOLTAN_LIB_DIRS
}
!"
)
else
()
target_link_libraries
(
${
_TARGET_
}
${
_SCOPE_
}
${
_ZOLTAN_EXTERN_LIB
}
)
endif
()
unset
(
_ZOLTAN_EXTERN_LIB CACHE
)
else
()
message
(
WARNING
"Unknown link parameter
\"
${
LIBS
}
\"
"
)
endif
()
endforeach
(
LIBS
)
endif
()
endmacro
(
parse_zoltan_makefile
)
AMDiS/cmake3/target_enable_png.cmake
View file @
7abd6b1b
...
@@ -9,12 +9,21 @@ macro(target_enable_png _TARGET_ _SCOPE_)
...
@@ -9,12 +9,21 @@ macro(target_enable_png _TARGET_ _SCOPE_)
HINTS ENV CPATH /usr/include
HINTS ENV CPATH /usr/include
DOC
"headerfile png.h for PNG-READER"
)
DOC
"headerfile png.h for PNG-READER"
)
if
(
_PNG_H
)
if
(
NOT _PNG_H
)
get_filename_component
(
PNG_PATH
${
_PNG_H
}
PATH
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
PNG_PATH
}
)
else
()
message
(
FATAL_ERROR
"Could not find the PNG header png.h."
)
message
(
FATAL_ERROR
"Could not find the PNG header png.h."
)
endif
()
else
()
file
(
STRINGS
${
_PNG_H
}
PNG_VERSION_LINE REGEX
"#define PNG_LIBPNG_VER_STRING"
)
string
(
REGEX MATCH
"
\"
([0-9]+[.][0-9]+([.][0-9]+)?)
\"
"
PNG_VERSION_LINE
${
PNG_VERSION_LINE
}
)
set
(
PNG_VERSION
${
CMAKE_MATCH_1
}
)
message
(
STATUS
"Libpng version:
${
PNG_VERSION
}
"
)
if
(
NOT PNG_VERSION VERSION_LESS
"1.6"
OR NOT PNG_VERSION VERSION_GREATER
"1.2"
)
message
(
FATAL_ERROR
"Incompatible libpng version. Requires 1.2.x"
)
endif
()
endif
()
get_filename_component
(
PNG_PATH
${
_PNG_H
}
PATH
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
PNG_PATH
}
)
if
(
LINK_EXECUTABLE
)
if
(
LINK_EXECUTABLE
)
find_library
(
_PNG_LIB png
find_library
(
_PNG_LIB png
...
...
AMDiS/cmake3/target_enable_zoltan.cmake
View file @
7abd6b1b
include
(
ZoltanConfig
)
macro
(
target_enable_zoltan _TARGET_ _SCOPE_
)
macro
(
target_enable_zoltan _TARGET_ _SCOPE_
)
if
(
${
ARGC
}
GREATER 2
)
if
(
${
ARGC
}
GREATER 2
)
set
(
LINK_EXECUTABLE ON
)
set
(
LINK_EXECUTABLE ON
)
...
@@ -5,22 +6,55 @@ macro(target_enable_zoltan _TARGET_ _SCOPE_)
...
@@ -5,22 +6,55 @@ macro(target_enable_zoltan _TARGET_ _SCOPE_)
set
(
LINK_EXECUTABLE OFF
)
set
(
LINK_EXECUTABLE OFF
)
endif
()
endif
()
find_file
(
ZOLTAN_HEADER_FILE
"zoltan_cpp.h"
HINTS
${
ZOLTAN_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
)
find_package
(
Zoltan QUIET
)
if
(
ZOLTAN_HEADER_FILE
)
if
(
Zoltan_FOUND
)
get_filename_component
(
ZOLTAN_HEADER_DIR
"
${
ZOLTAN_HEADER_FILE
}
"
PATH CACHE
)
find_file
(
ZOLTAN_HEADER_FILE
"zoltan.h"
PATHS
${
Zoltan_INCLUDE_DIRS
}
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
ZOLTAN_HEADER_DIR
}
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
Zoltan_INCLUDE_DIRS
}
)
else
()
message
(
FATAL_ERROR
"Could not find Zoltan include file 'zoltan_cpp.h'!"
)
if
(
LINK_EXECUTABLE
)
endif
(
ZOLTAN_HEADER_FILE
)
foreach
(
LIB_NAME
${
Zoltan_LIBRARIES
}
)
find_library
(
_ZOLTAN_LIB
${
LIB_NAME
}
HINTS
${
Zoltan_LIBRARY_DIRS
}
)
if
(
NOT _ZOLTAN_LIB
)
message
(
FATAL_ERROR
"Could not find library
\"
${
LIB_NAME
}
\"
in directories
${
Zoltan_LIBRARY_DIRS
}
!"
)
else
()
target_link_libraries
(
${
_TARGET_
}
${
_SCOPE_
}
${
_ZOLTAN_LIB
}
)
endif
()
unset
(
_ZOLTAN_LIB CACHE
)
endforeach
(
LIB_NAME
)
endif
(
LINK_EXECUTABLE
)
else
(
Zoltan_FOUND
)
find_file
(
ZOLTAN_HEADER_FILE
"zoltan.h"
HINTS
${
ZOLTAN_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
)
if
(
ZOLTAN_HEADER_FILE
)
get_filename_component
(
Zoltan_INCLUDE_DIR
"
${
ZOLTAN_HEADER_FILE
}
"
PATH CACHE
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
Zoltan_INCLUDE_DIR
}
)
else
()
message
(
FATAL_ERROR
"Could not find Zoltan include file 'zoltan.h'!"
)
endif
(
ZOLTAN_HEADER_FILE
)
if
(
LINK_EXECUTABLE
)
find_library
(
ZOLTAN_LIB zoltan
HINTS
${
Zoltan_INCLUDE_DIR
}
/../lib DOC
"Full path to the zoltan library"
)
if
(
NOT ZOLTAN_LIB
)
message
(
FATAL_ERROR
"Could not find zoltan library!"
)
endif
(
NOT ZOLTAN_LIB
)
target_link_libraries
(
${
_TARGET_
}
${
_SCOPE_
}
${
ZOLTAN_LIB
}
)
if
(
LINK_EXECUTABLE
)
find_file
(
ZOLTAN_CONFIG_FILE
"Makefile.export.zoltan"
HINTS
${
Zoltan_INCLUDE_DIR
}
)
find_library
(
ZOLTAN_LIB zoltan
if
(
ZOLTAN_CONFIG_FILE
)
HINTS ENV LIBRARY_PATH DOC
"Full path to the zoltan library"
)
parse_zoltan_makefile
(
${
ZOLTAN_CONFIG_FILE
}
${
_TARGET_
}
${
_SCOPE_
}
)
if
(
NOT ZOLTAN_LIB
)
else
()
message
(
FATAL_ERROR
"Could not find zoltan library!"
)
message
(
WARNING
"Zoltan configuration file Makefile.export.zoltan not found!"
)
endif
(
NOT ZOLTAN_LIB
)
endif
()
target_link_libraries
(
${
_TARGET_
}
${
_SCOPE_
}
${
ZOLTAN_LIB
}
)
endif
(
LINK_EXECUTABLE
)
endif
(
LINK_EXECUTABLE
)
target_compile_definitions
(
${
_TARGET_
}
${
_SCOPE_
}
HAVE_ZOLTAN=1
)
target_compile_definitions
(
${
_TARGET_
}
${
_SCOPE_
}
HAVE_ZOLTAN=1
)
endif
(
Zoltan_FOUND
)
if
(
ZOLTAN_HEADER_FILE
)
file
(
STRINGS
${
ZOLTAN_HEADER_FILE
}
ZOLTAN_VERSION_LINE REGEX
"#define ZOLTAN_VERSION_NUMBER"
)
string
(
REGEX MATCH
"([0-9]+[.][0-9]+)"
ZOLTAN_VERSION_REGEX
${
ZOLTAN_VERSION_LINE
}
)
set
(
ZOLTAN_VERSION
${
CMAKE_MATCH_1
}
)
unset
(
ZOLTAN_HEADER_FILE CACHE
)
message
(
STATUS
"Zoltan version:
${
ZOLTAN_VERSION
}
"
)
endif
(
ZOLTAN_HEADER_FILE
)
endmacro
(
target_enable_zoltan
)
endmacro
(
target_enable_zoltan
)
CHANGELOG
View file @
7abd6b1b
amdis (@PACKAGE_VERSION
@-1
) @PACKAGE_DISTRIBUTION@; urgency=medium
amdis (@PACKAGE_VERSION
_FULL@
) @PACKAGE_DISTRIBUTION@; urgency=medium
* CMake configuration redesigned
* CMake configuration redesigned
* ARH3 reader corrected to parse .parh files correctly
* ARH3 reader corrected to parse .parh files correctly
...
...
tools/build_amdis.sh
View file @
7abd6b1b
...
@@ -5,6 +5,7 @@ ROOT=${PWD}
...
@@ -5,6 +5,7 @@ ROOT=${PWD}
STAGE
=
"build"
STAGE
=
"build"
CONFIG
=
"Release"
CONFIG
=
"Release"
COMPONENT
=
"SEQUENTIAL"
COMPONENT
=
"SEQUENTIAL"
ENABLE_PNG
=
"0"
# parse command line
# parse command line
if
[
$#
-gt
0
]
;
then
if
[
$#
-gt
0
]
;
then
...
@@ -19,6 +20,9 @@ if [ $# -gt 0 ]; then
...
@@ -19,6 +20,9 @@ if [ $# -gt 0 ]; then
--parallel
)
--parallel
)
COMPONENT
=
"PARALLEL"
# [SEQUENTIAL|PARALLEL]
COMPONENT
=
"PARALLEL"
# [SEQUENTIAL|PARALLEL]
shift
;;
shift
;;
--png
)
ENABLE_PNG
=
"1"
shift
;;
--
)
--
)
shift
shift
break
;;
break
;;
...
@@ -40,12 +44,15 @@ fi
...
@@ -40,12 +44,15 @@ fi
if
[
"
${
COMPONENT
}
"
==
"SEQUENTIAL"
]
;
then
if
[
"
${
COMPONENT
}
"
==
"SEQUENTIAL"
]
;
then
POSTFIX
=
"
${
POSTFIX
}
_seq"
POSTFIX
=
"
${
POSTFIX
}
_seq"
FLAGS
=
"-DENABLE_UMFPACK:BOOL=ON"
FLAGS
=
"-DENABLE_UMFPACK:BOOL=ON
-DENABLE_HYPRE:BOOL=ON
"
else
else
POSTFIX
=
"
${
POSTFIX
}
_par"
POSTFIX
=
"
${
POSTFIX
}
_par"
FLAGS
=
"-DENABLE_UMFPACK:BOOL=OFF -DENABLE_PARALLEL_DOMAIN:BOOL=ON"
FLAGS
=
"-DENABLE_UMFPACK:BOOL=OFF -DENABLE_PARALLEL_DOMAIN:BOOL=ON
-DENABLE_ZOLTAN:BOOL=ON
"
fi
fi
if
[
"
${
ENABLE_PNG
}
"
==
"1"
]
;
then
FLAGS
=
"
${
FLAGS
}
-DENABLE_PNG:BOOL=ON"
fi
if
[[
"
${
STAGE
}
"
==
"build"
||
"
${
STAGE
}
"
==
"all"
]]
;
then
if
[[
"
${
STAGE
}
"
==
"build"
||
"
${
STAGE
}
"
==
"all"
]]
;
then
# at first build AMDiS
# at first build AMDiS
...
...
tools/packaging/debian/control.in
View file @
7abd6b1b
...
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48),
...
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48),
libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
zlib1g-dev (>= 1.2), libsuitesparse-dev (>= 4.2.1), cmake (>= 2.8.10),
zlib1g-dev (>= 1.2), libsuitesparse-dev (>= 4.2.1), cmake (>= 2.8.10),
petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), pkg-config (>= 0.26)
petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), pkg-config (>= 0.26)
, libmetis-dev (>= 5.0)
Package: libamdis-dev
Package: libamdis-dev
Architecture: any
Architecture: any
...
@@ -17,8 +17,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48),
...
@@ -17,8 +17,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48),
libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
zlib1g-dev (>= 1.2), cmake (>= 2.8.10), pkg-config (>= 0.26)