Commit 352be0ce authored by Andreas Marek's avatar Andreas Marek

Change of gitlab ci

parent 04a06545
......@@ -1237,14 +1237,10 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-special-gcov-jobs:
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- export OMP_NUM_THREADS=1
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# jobs for intel/gfortran single precision mpi and openmp ftimings and redirect enabled
......@@ -1269,10 +1265,6 @@ intel-single-precision-mpi-openmp-ftimings-redirect-assumed-size-jobs:
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- export OMP_NUM_THREADS=2
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-openmp-ftimings-redirect-jobs:
tags:
......@@ -1307,14 +1299,10 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-special-gcov-jobs:
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- export OMP_NUM_THREADS=1
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# jobs for intel/gfortran double precision nompi and openmp ftimings and redirect enabled
......@@ -1351,10 +1339,6 @@ gfortran-double-precision-nompi-openmp-ftimings-redirect-jobs:
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- export OMP_NUM_THREADS=2
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-double-precision-nompi-openmp-ftimings-redirect-assumed-size-jobs:
tags:
......@@ -1378,14 +1362,10 @@ gfortran-double-precision-nompi-openmp-ftimings-redirect-special-gcov-jobs:
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- export OMP_NUM_THREADS=1
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# jobs for intel/gfortran single precision mpi and openmp ftimings and redirect enabled
......@@ -1412,10 +1392,6 @@ intel-double-precision-mpi-openmp-ftimings-redirect-real-generic-complex-generic
- export OMP_NUM_THREADS=2
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-double-precision-mpi-openmp-ftimings-redirect-real-generic-complex-generic-kernel-jobs:
tags:
......@@ -1450,15 +1426,10 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-generic-complex-gene
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-openmp-ftimings-redirect-real-generic-complex-generic-kernel-jobs:
tags:
......@@ -1490,15 +1461,10 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-generic-complex-ge
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-openmp-ftimings-redirect-real-generic-complex-generic-kernel-special-gcov-jobs:
tags:
......@@ -1539,14 +1505,10 @@ gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-generic-complex-ge
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-generic-complex-generic-kernel-assumed-size-jobs:
tags:
......@@ -1574,10 +1536,6 @@ intel-single-precision-mpi-openmp-ftimings-redirect-real-generic-simple-complex-
- export OMP_NUM_THREADS=2
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
intel-double-precision-mpi-openmp-ftimings-redirect-real-generic-simple-complex-generic-simple-kernel-assumed-size-jobs:
tags:
......@@ -1611,14 +1569,10 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-generic-simple-compl
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# real generic simple, complex generic simple
intel-single-precision-mpi-noopenmp-ftimings-redirect-real-generic-simple-complex-generic-simple-kernel-jobs:
......@@ -1654,14 +1608,10 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-generic-simple-com
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# real sse assembly, complex sse assembly
intel-single-precision-mpi-openmp-ftimings-redirect-real-sse_assembly-complex-sse_assembly-kernel-jobs:
......@@ -1685,10 +1635,6 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-sse_assembly-complex
- export OMP_NUM_THREADS=2
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-openmp-ftimings-redirect-real-sse_assembly-complex-sse_assembly-kernel-special-gcov-jobs:
tags:
......@@ -1725,14 +1671,10 @@ gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-sse_assembly-compl
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-sse_assembly-complex-sse_assembly-kernel-assumed-size-jobs:
tags:
......@@ -1760,10 +1702,6 @@ intel-single-precision-mpi-openmp-ftimings-redirect-real-sse_block2-complex-sse_
- export OMP_NUM_THREADS=2
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-openmp-ftimings-redirect-real-sse_block2-complex-sse_block1-kernel-jobs:
tags:
......@@ -1827,16 +1765,11 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-sse_block2-complex
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# real sse block4, complex sse block 2
intel-single-precision-mpi-openmp-ftimings-redirect-real-sse_block4-complex-sse_block2-kernel-jobs:
......@@ -1871,7 +1804,6 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-sse_block4-complex-s
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
......@@ -1887,9 +1819,6 @@ intel-single-precision-mpi-noopenmp-ftimings-redirect-real-sse_block4-complex-ss
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-sse_block4-complex-sse_block2-kernel-jobs:
tags:
......@@ -1914,14 +1843,10 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-sse_block4-complex
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# real sse block6, complex avx block1
intel-single-precision-mpi-openmp-ftimings-redirect-real-sse_block6-complex-avx_block1-kernel-jobs:
......@@ -1956,7 +1881,6 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-sse_block6-complex-a
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
......@@ -1972,9 +1896,6 @@ intel-single-precision-mpi-noopenmp-ftimings-redirect-real-sse_block6-complex-av
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-noopenmp-mpi-ftimings-redirect-real-sse_block6-complex-avx_block1-kernel-jobs:
tags:
......@@ -1999,14 +1920,10 @@ gfortran-double-precision-noopenmp-mpi-ftimings-redirect-real-sse_block6-complex
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
#real avx block2, complex avx block2
intel-single-precision-mpi-openmp-ftimings-redirect-real-avx_block2-complex-avx_block2-kernel-jobs:
......@@ -2041,7 +1958,6 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-avx_block2-complex-a
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
......@@ -2058,10 +1974,6 @@ intel-single-precision-mpi-noopenmp-ftimings-redirect-real-avx_block2-complex-av
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-avx_block2-complex-avx_block2-kernel-jobs:
tags:
- cpu
......@@ -2085,14 +1997,10 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-avx_block2-complex
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
#real avx block4, complex avx block2
intel-single-precision-mpi-openmp-ftimings-redirect-real-avx_block4-complex-avx_block2-kernel-jobs:
......@@ -2127,7 +2035,6 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-avx_block4-complex-a
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
......@@ -2143,9 +2050,6 @@ intel-single-precision-mpi-noopenmp-ftimings-redirect-real-avx_block4-complex-av
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-avx_block4-complex-avx_block2-kernel-jobs:
tags:
......@@ -2170,14 +2074,10 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-avx_block4-complex
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
#real avx block6, complex block 2
intel-single-precision-mpi-openmp-ftimings-redirect-real-avx_block6-complex-avx_block2-kernel-jobs:
......@@ -2212,14 +2112,10 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-avx_block6-complex-a
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
#real avx block6 , complex block2
intel-single-precision-mpi-noopenmp-ftimings-redirect-real-avx_block6-complex-avx_block2-kernel-jobs:
......@@ -2241,14 +2137,10 @@ gfortran-single-precision-mpi-nopenmp-ftimings-redirect-real-avx_block6-complex-
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-avx_block6-complex-avx_block2-kernel-assumed-size-jobs:
tags:
......@@ -2297,18 +2189,12 @@ gfortran-single-precision-mpi-openmp-ftimings-redirect-real-avx2_block2-complex-
- make -j 8
- export OMP_NUM_THREADS=1
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
<<<<<<< HEAD
- /home/elpa/bin/sde-external-7.45.0-2016-05-09-lin/sde -hsw -- make check TEST_FLAGS='150 50 16'
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
- make check TEST_FLAGS='1500 50 16'
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
#real avx2 block2, complex avx2 block1 (emulated)
intel-single-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block2-complex-avx2_block1-kernel-jobs:
......@@ -2329,7 +2215,6 @@ gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block2-comple
- ./configure FC=mpif90 CFLAGS="--coverage -O3 -march=haswell -mavx2 -mfma" FCFLAGS="--coverage -O3 -march=haswell -mavx2 -mfma" SCALAPACK_LDFLAGS="$MKL_GFORTRAN_SCALAPACK_MPI_NO_OMP" SCALAPACK_FCFLAGS="$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_NO_OMP" --with-ftimings --with-redirect --with-real-avx2_block2-kernel-only --with-complex-avx2_block1-kernel-only --enable-single-precision
- make -j 8
- export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
<<<<<<< HEAD
- /home/elpa/bin/sde-external-7.45.0-2016-05-09-lin/sde -hsw -- make check TEST_FLAGS='150 50 16'
- ./ci_coverage_collect
artifacts:
......@@ -2472,10 +2357,6 @@ gfortran-single-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block6-comple
# testing of kernel settinv via environment
=======
- make check TEST_FLAGS='1500 50 16'
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
intel-set-kernel-via-environment-variable-mpi-openmp-job:
tags:
......@@ -2515,14 +2396,10 @@ gfortran-set-kernel-via-environment-variable-mpi-openmp-special-gcov-job:
- export COMPLEX_ELPA_KERNEL=COMPLEX_ELPA_KERNEL_GENERIC
- export OMP_NUM_THREADS=1
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
intel-set-kernel-via-environment-variable-mpi-noopenmp-job:
tags:
......@@ -2547,14 +2424,10 @@ gfortran-set-kernel-via-environment-variable-mpi-noopenmp-job:
- export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
- export COMPLEX_ELPA_KERNEL=COMPLEX_ELPA_KERNEL_GENERIC
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
intel-set-kernel-via-environment-variable-nompi-openmp-job:
tags:
......@@ -2594,14 +2467,10 @@ gfortran-set-kernel-via-environment-variable-nompi-openmp-special-gcov-job:
- export COMPLEX_ELPA_KERNEL=COMPLEX_ELPA_KERNEL_GENERIC
- export OMP_NUM_THREADS=1
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
intel-set-kernel-via-environment-variable-nompi-noopenmp-job:
tags:
......@@ -2626,16 +2495,11 @@ gfortran-set-kernel-via-environment-variable-nompi-noopenmp-job:
- export REAL_ELPA_KERNEL=REAL_ELPA_KERNEL_GENERIC
- export COMPLEX_ELPA_KERNEL=COMPLEX_ELPA_KERNEL_GENERIC
- make check TEST_FLAGS='1500 50 16'
<<<<<<< HEAD
- ./ci_coverage_collect
artifacts:
paths:
- coverage_data
=======
# - ./test_scripts/get_coverage_summary.sh
>>>>>>> bugfixes_current_release
# test distcheck
distcheck:
tags:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment