Commit adaee9ca authored by Lorenz Huedepohl's avatar Lorenz Huedepohl

Merge branch 'master' of gitlab.mpcdf.mpg.de:elpa/elpa into loh/master

parents 1acbcf5d dedbf4d9
......@@ -871,7 +871,6 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-sse_block2-complex-s
paths:
- coverage_data
# real sse block2, complex sse block1
intel-double-precision-mpi-noopenmp-ftimings-redirect-real-sse_block2-complex-sse_block1-kernel-jobs:
......@@ -922,7 +921,6 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-sse_block2-complex
paths:
- coverage_data
# real sse block4, complex sse block 2
intel-double-precision-mpi-openmp-ftimings-redirect-real-sse_block4-complex-sse_block2-kernel-jobs:
......@@ -1098,7 +1096,6 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-sse_block6-complex-a
paths:
- coverage_data
# real sse block6, complex avx block1
intel-double-precision-mpi-noopenmp-ftimings-redirect-real-sse_block6-complex-avx_block1-kernel-jobs:
......@@ -1264,7 +1261,6 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-avx_block2-complex
paths:
- coverage_data
#real avx block4, complex avx block2
intel-double-precision-mpi-openmp-ftimings-redirect-real-avx_block4-complex-avx_block2-kernel-jobs:
......@@ -1326,7 +1322,6 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-avx_block4-complex-a
paths:
- coverage_data
#real avx block4, complex block2
intel-double-precision-mpi-noopenmp-ftimings-redirect-real-avx_block4-complex-avx_block2-kernel-jobs:
......@@ -1531,7 +1526,6 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-avx2_block2-complex-
paths:
- coverage_data
#real avx2 block2, complex avx2 block1 (emulated)
intel-double-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block2-complex-avx2_block1-kernel-jobs:
......@@ -1558,7 +1552,6 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block2-comple
paths:
- coverage_data
#real avx2 block4, complex avx2 block2 (emulated)
intel-double-precision-mpi-openmp-ftimings-redirect-real-avx2_block4-complex-avx2_block2-kernel-jobs:
......@@ -1598,7 +1591,6 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-avx2_block4-complex-
paths:
- coverage_data
#real avx2 block4, complex avx2 block2 (emulated)
intel-double-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block4-complex-avx2_block2-kernel-jobs:
......@@ -1625,7 +1617,6 @@ gfortran-double-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block4-comple
paths:
- coverage_data
#real avx2 block6, complex avx2 block2 (emulated)
intel-double-precision-mpi-openmp-ftimings-redirect-real-avx2_block6-complex-avx2_block2-kernel-jobs:
......@@ -1665,7 +1656,6 @@ gfortran-double-precision-mpi-openmp-ftimings-redirect-real-avx2_block6-complex-
paths:
- coverage_data
#real avx2 block6, complex avx2 block2 (emulated)
intel-double-precision-mpi-noopenmp-ftimings-redirect-real-avx2_block6-complex-avx2_block2-kernel-jobs:
......@@ -1837,7 +1827,6 @@ gfortran-set-kernel-via-environment-variable-nompi-noopenmp-job:
paths:
- coverage_data
# test distcheck
distcheck:
tags:
......
......@@ -13,6 +13,7 @@ libelpa@SUFFIX@_public_la_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@modules @FC_MODINC@
libelpa@SUFFIX@_public_la_SOURCES = \
src/elpa1.F90 \
src/elpa2.F90 \
src/elpa1_auxiliary.F90 \
src/elpa2_utilities.F90 \
src/elpa_utilities.F90
......@@ -28,7 +29,7 @@ libelpa@SUFFIX@_private_la_SOURCES = \
src/mod_compute_hh_trafo_complex.F90 \
src/mod_pack_unpack_complex.F90 \
src/aligned_mem.F90 \
src/elpa1_compute.F90 \
src/elpa1_compute_private.F90 \
src/elpa2_compute.F90 \
src/elpa2_kernels/mod_fortran_interfaces.F90 \
src/elpa2_kernels/mod_single_hh_trafo_real.F90 \
......
......@@ -83,6 +83,7 @@
module ELPA1
use precision
use elpa_utilities
use elpa1_auxiliary
implicit none
......
This diff is collapsed.
......@@ -192,7 +192,7 @@ module compute_hh_trafo_complex
#if defined(WITH_NO_SPECIFIC_COMPLEX_KERNEL)
endif
#endif /* WITH_NO_SPECIFIC_COMPLEX_KERNEL */
#endif /* WITH_COMPLEX_AVX_BLOCK2_KERNEL */
#endif /* WITH_COMPLEX_AVX_BLOCK2_KERNEL || WITH_COMPLEX_AVX2_BLOCK2_KERNEL */
#if defined(WITH_COMPLEX_GENERIC_SIMPLE_KERNEL)
......@@ -334,7 +334,7 @@ module compute_hh_trafo_complex
#if defined(WITH_NO_SPECIFIC_COMPLEX_KERNEL)
endif
#endif /* WITH_NO_SPECIFIC_COMPLEX_KERNEL */
#endif /* WITH_COMPLEX_AVX_BLOCK1_KERNEL */
#endif /* WITH_COMPLEX_AVX_BLOCK1_KERNEL || WITH_COMPLEX_AVX2_BLOCK1_KERNEL */
#ifdef WITH_OPENMP
if (my_thread==1) then
......
......@@ -304,7 +304,7 @@ module compute_hh_trafo_real
#if defined(WITH_NO_SPECIFIC_REAL_KERNEL)
endif
#endif /* WITH_NO_SPECIFIC_REAL_KERNEL */
#endif /* WITH_REAL_AVX_BLOCK2_KERNEL */
#endif /* WITH_REAL_AVX_BLOCK2_KERNEL || WITH_REAL_AVX2_BLOCK2_KERNEL */
#if defined(WITH_REAL_BGP_KERNEL)
#if defined(WITH_NO_SPECIFIC_REAL_KERNEL)
......@@ -460,7 +460,7 @@ module compute_hh_trafo_real
#if defined(WITH_NO_SPECIFIC_REAL_KERNEL)
endif
#endif /* WITH_NO_SPECIFIC_REAL_KERNEL */
#endif /* WITH_REAL_AVX_BLOCK4_KERNEL */
#endif /* WITH_REAL_AVX_BLOCK4_KERNEL || WITH_REAL_AVX2_BLOCK4_KERNEL */
#if defined(WITH_REAL_SSE_BLOCK6_KERNEL)
#if defined(WITH_NO_SPECIFIC_REAL_KERNEL)
......
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