Skip to content
Snippets Groups Projects
Commit 8c5161ed authored by Stephan Schulz's avatar Stephan Schulz
Browse files

Merge branch 'master' of ssh://gitlab.version.fz-juelich.de:10022/SLMS/loadbalancing

parents 5c0d45f7 506f20c6
No related branches found
No related tags found
No related merge requests found
Pipeline #54158 passed
Stage: build_mpich_gcc8
Stage: build_openmpi_gcc8
Stage: build_mpich_gcc9
Stage: build_openmpi_gcc9
Stage: build_mpich_gcc10
Stage: build_openmpi_gcc10
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 39
− 42
View file @ 8c5161ed
...@@ -14,9 +14,6 @@ before_script: ...@@ -14,9 +14,6 @@ before_script:
# - ls # - ls
# - ls -l ci # - ls -l ci
- mkdir -p badges/ - mkdir -p badges/
- apt-get update
- apt-get install -y cmake
- apt-get update -y
badges: badges:
stage: init stage: init
...@@ -52,7 +49,7 @@ build-mpich-nofortran-gcc8: ...@@ -52,7 +49,7 @@ build-mpich-nofortran-gcc8:
build-mpich-nofortran-gcc9: build-mpich-nofortran-gcc9:
stage: build_mpich_gcc9 stage: build_mpich_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -67,7 +64,7 @@ build-mpich-nofortran-gcc9: ...@@ -67,7 +64,7 @@ build-mpich-nofortran-gcc9:
build-mpich-nofortran-gcc10: build-mpich-nofortran-gcc10:
stage: build_mpich_gcc10 stage: build_mpich_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -97,7 +94,7 @@ build-mpich-fortran-gcc8: ...@@ -97,7 +94,7 @@ build-mpich-fortran-gcc8:
build-mpich-fortran-gcc9: build-mpich-fortran-gcc9:
stage: build_mpich_gcc9 stage: build_mpich_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -112,7 +109,7 @@ build-mpich-fortran-gcc9: ...@@ -112,7 +109,7 @@ build-mpich-fortran-gcc9:
build-mpich-fortran-gcc10: build-mpich-fortran-gcc10:
stage: build_mpich_gcc10 stage: build_mpich_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -125,24 +122,24 @@ build-mpich-fortran-gcc10: ...@@ -125,24 +122,24 @@ build-mpich-fortran-gcc10:
- badges/ - badges/
allow_failure: false allow_failure: false
build-mpich-fortran-f08-gcc8: #build-mpich-fortran-f08-gcc8:
stage: build_mpich_gcc8 # stage: build_mpich_gcc8
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc8-full # image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc8-full
tags: # tags:
- public-docker # - public-docker
when: always # when: always
script: # script:
- ./ci/build_mpi_fortran_f08.sh # - ./ci/build_mpi_fortran_f08.sh
artifacts: # artifacts:
name: pages # name: pages
when: always # when: always
paths: # paths:
- badges/ # - badges/
allow_failure: true # allow_failure: true
build-mpich-fortran-f08-gcc9: build-mpich-fortran-f08-gcc9:
stage: build_mpich_gcc9 stage: build_mpich_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -157,7 +154,7 @@ build-mpich-fortran-f08-gcc9: ...@@ -157,7 +154,7 @@ build-mpich-fortran-f08-gcc9:
build-mpich-fortran-f08-gcc10: build-mpich-fortran-f08-gcc10:
stage: build_mpich_gcc10 stage: build_mpich_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -187,7 +184,7 @@ build-mpich-voronoi-gcc8: ...@@ -187,7 +184,7 @@ build-mpich-voronoi-gcc8:
build-mpich-voronoi-gcc9: build-mpich-voronoi-gcc9:
stage: build_mpich_gcc9 stage: build_mpich_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -202,7 +199,7 @@ build-mpich-voronoi-gcc9: ...@@ -202,7 +199,7 @@ build-mpich-voronoi-gcc9:
build-mpich-voronoi-gcc10: build-mpich-voronoi-gcc10:
stage: build_mpich_gcc10 stage: build_mpich_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -217,7 +214,7 @@ build-mpich-voronoi-gcc10: ...@@ -217,7 +214,7 @@ build-mpich-voronoi-gcc10:
build-openmpi-nofortran-gcc8: build-openmpi-nofortran-gcc8:
stage: build_openmpi_gcc8 stage: build_openmpi_gcc8
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -232,7 +229,7 @@ build-openmpi-nofortran-gcc8: ...@@ -232,7 +229,7 @@ build-openmpi-nofortran-gcc8:
build-openmpi-nofortran-gcc9: build-openmpi-nofortran-gcc9:
stage: build_openmpi_gcc9 stage: build_openmpi_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -247,7 +244,7 @@ build-openmpi-nofortran-gcc9: ...@@ -247,7 +244,7 @@ build-openmpi-nofortran-gcc9:
build-openmpi-nofortran-gcc10: build-openmpi-nofortran-gcc10:
stage: build_openmpi_gcc10 stage: build_openmpi_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -262,7 +259,7 @@ build-openmpi-nofortran-gcc10: ...@@ -262,7 +259,7 @@ build-openmpi-nofortran-gcc10:
build-openmpi-fortran-gcc8: build-openmpi-fortran-gcc8:
stage: build_openmpi_gcc8 stage: build_openmpi_gcc8
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -277,7 +274,7 @@ build-openmpi-fortran-gcc8: ...@@ -277,7 +274,7 @@ build-openmpi-fortran-gcc8:
build-openmpi-fortran-gcc9: build-openmpi-fortran-gcc9:
stage: build_openmpi_gcc9 stage: build_openmpi_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -292,7 +289,7 @@ build-openmpi-fortran-gcc9: ...@@ -292,7 +289,7 @@ build-openmpi-fortran-gcc9:
build-openmpi-fortran-gcc10: build-openmpi-fortran-gcc10:
stage: build_openmpi_gcc10 stage: build_openmpi_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -307,7 +304,7 @@ build-openmpi-fortran-gcc10: ...@@ -307,7 +304,7 @@ build-openmpi-fortran-gcc10:
build-openmpi-fortran-f08-gcc8: build-openmpi-fortran-f08-gcc8:
stage: build_openmpi_gcc8 stage: build_openmpi_gcc8
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -322,7 +319,7 @@ build-openmpi-fortran-f08-gcc8: ...@@ -322,7 +319,7 @@ build-openmpi-fortran-f08-gcc8:
build-openmpi-fortran-f08-gcc9: build-openmpi-fortran-f08-gcc9:
stage: build_openmpi_gcc9 stage: build_openmpi_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -337,7 +334,7 @@ build-openmpi-fortran-f08-gcc9: ...@@ -337,7 +334,7 @@ build-openmpi-fortran-f08-gcc9:
build-openmpi-fortran-f08-gcc10: build-openmpi-fortran-f08-gcc10:
stage: build_openmpi_gcc10 stage: build_openmpi_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -352,7 +349,7 @@ build-openmpi-fortran-f08-gcc10: ...@@ -352,7 +349,7 @@ build-openmpi-fortran-f08-gcc10:
build-openmpi-voronoi-gcc8: build-openmpi-voronoi-gcc8:
stage: build_openmpi_gcc8 stage: build_openmpi_gcc8
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -367,7 +364,7 @@ build-openmpi-voronoi-gcc8: ...@@ -367,7 +364,7 @@ build-openmpi-voronoi-gcc8:
build-openmpi-voronoi-gcc9: build-openmpi-voronoi-gcc9:
stage: build_openmpi_gcc9 stage: build_openmpi_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -382,7 +379,7 @@ build-openmpi-voronoi-gcc9: ...@@ -382,7 +379,7 @@ build-openmpi-voronoi-gcc9:
build-openmpi-voronoi-gcc10: build-openmpi-voronoi-gcc10:
stage: build_openmpi_gcc10 stage: build_openmpi_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10_mpi image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10-full
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -412,7 +409,7 @@ build-mpich-complete-gcc8: ...@@ -412,7 +409,7 @@ build-mpich-complete-gcc8:
build-mpich-complete-gcc9: build-mpich-complete-gcc9:
stage: build_mpich_gcc9 stage: build_mpich_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9_mpi-vtk-doxy2:latest image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc9-full:latest
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -427,7 +424,7 @@ build-mpich-complete-gcc9: ...@@ -427,7 +424,7 @@ build-mpich-complete-gcc9:
build-mpich-complete-gcc10: build-mpich-complete-gcc10:
stage: build_mpich_gcc10 stage: build_mpich_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10_mpi-vtk-doxy2:latest image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/mpich-gcc10-full:latest
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -442,7 +439,7 @@ build-mpich-complete-gcc10: ...@@ -442,7 +439,7 @@ build-mpich-complete-gcc10:
build-openmpi-complete-gcc8: build-openmpi-complete-gcc8:
stage: build_openmpi_gcc8 stage: build_openmpi_gcc8
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8_mpi:latest image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc8-full:latest
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -457,7 +454,7 @@ build-openmpi-complete-gcc8: ...@@ -457,7 +454,7 @@ build-openmpi-complete-gcc8:
build-openmpi-complete-gcc9: build-openmpi-complete-gcc9:
stage: build_openmpi_gcc9 stage: build_openmpi_gcc9
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9_mpi:latest image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc9-full:latest
tags: tags:
- public-docker - public-docker
when: always when: always
...@@ -472,7 +469,7 @@ build-openmpi-complete-gcc9: ...@@ -472,7 +469,7 @@ build-openmpi-complete-gcc9:
build-openmpi-complete-gcc10: build-openmpi-complete-gcc10:
stage: build_openmpi_gcc10 stage: build_openmpi_gcc10
image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10_mpi:latest image: gitlab.version.fz-juelich.de:5555/slms/loadbalancing/openmpi-gcc10-full:latest
tags: tags:
- public-docker - public-docker
when: always when: always
......
ci/build_mpi_complete.sh
+ 1
− 1
View file @ 8c5161ed
...@@ -16,7 +16,7 @@ if [[ $? == 0 ]]; then ...@@ -16,7 +16,7 @@ if [[ $? == 0 ]]; then
#CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} .. #CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} ..
${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_USE_F08=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-7.1 ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_USE_F08=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-7.1
make VERBOSE=1 make VERBOSE=1
make test ctest -L unit
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
create_badge "${BADGE_FILENAME}" build-mpi passed --color=green create_badge "${BADGE_FILENAME}" build-mpi passed --color=green
......
ci/build_mpi_complete_gcc8.sh
+ 1
− 1
View file @ 8c5161ed
...@@ -16,7 +16,7 @@ if [[ $? == 0 ]]; then ...@@ -16,7 +16,7 @@ if [[ $? == 0 ]]; then
#CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} .. #CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} ..
${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-7.1 ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-7.1
make VERBOSE=1 make VERBOSE=1
make test ctest -L unit
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
create_badge "${BADGE_FILENAME}" build-mpi passed --color=green create_badge "${BADGE_FILENAME}" build-mpi passed --color=green
......
tests/feature/CMakeLists.txt
+ 19
− 1
View file @ 8c5161ed
...@@ -9,6 +9,17 @@ target_compile_options(TestCompare PRIVATE -Wall -Wextra -g) ...@@ -9,6 +9,17 @@ target_compile_options(TestCompare PRIVATE -Wall -Wextra -g)
# in CMake.. # in CMake..
set(OUTPUTDIR .) set(OUTPUTDIR .)
set(KNOWNGOOD ${CMAKE_CURRENT_SOURCE_DIR}/knowngood) set(KNOWNGOOD ${CMAKE_CURRENT_SOURCE_DIR}/knowngood)
# check if openmpi variable in mpi.h is set to find out, if
# MPI version is openmpi based
include(CheckCSourceCompiles)
check_c_source_compiles(
"include <mpi.h>
int main(void) {
#ifndef _OPENMPI
#error
#endif
return 0;
}" HAVE_OPENMPI)
include(FindUnixCommands) include(FindUnixCommands)
foreach( FEATURE foreach( FEATURE
ALL_Staggered ALL_Staggered
...@@ -19,10 +30,17 @@ foreach( FEATURE ...@@ -19,10 +30,17 @@ foreach( FEATURE
) )
set(OUTPUTFILE ${OUTPUTDIR}/out_${FEATURE}_${NP}.dat) set(OUTPUTFILE ${OUTPUTDIR}/out_${FEATURE}_${NP}.dat)
set(GOODFILE ${KNOWNGOOD}/${FEATURE}_${NP}.dat) set(GOODFILE ${KNOWNGOOD}/${FEATURE}_${NP}.dat)
if (HAVE_OPENMPI)
add_test( add_test(
NAME feature_${FEATURE}_${NP}_setup NAME feature_${FEATURE}_${NP}_setup
COMMAND ${BASH} -c "mpirun --oversubscribe -np ${NP} $<TARGET_FILE:${FEATURE}> > ${OUTPUTFILE}; exit $?" COMMAND ${BASH} -c "mpirun --oversubscribe -np ${NP} $<TARGET_FILE:${FEATURE}> > ${OUTPUTFILE}; exit $?"
) )
else()
add_test(
NAME feature_${FEATURE}_${NP}_setup
COMMAND ${BASH} -c "mpirun -n ${NP} $<TARGET_FILE:${FEATURE}> > ${OUTPUTFILE}; exit $?"
)
endif(HAVE_OPENMPI)
# todo(s.schulz): This only works with OpenMPI, since the flags # todo(s.schulz): This only works with OpenMPI, since the flags
# are implementation dependant. # are implementation dependant.
set_tests_properties(feature_${FEATURE}_${NP}_setup PROPERTIES set_tests_properties(feature_${FEATURE}_${NP}_setup PROPERTIES
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment