Skip to content

GitLab

Commit 74a0c95b authored by Andreas Marek's avatar Andreas Marek
Browse files

Cleanup of src directory: mv ELPA 1 files in subdir"

parent c7b5d9da
Hide whitespace changes
Inline Side-by-side
Makefile.am
View file @ 74a0c95b
......@@ -12,10 +12,10 @@ noinst_LTLIBRARIES = libelpa@SUFFIX@_public.la
libelpa@SUFFIX@_public_la_FCFLAGS = $(AM_FCFLAGS) @FC_MODOUT@modules @FC_MODINC@private_modules
libelpa@SUFFIX@_public_la_SOURCES = \
src/elpa.F90 \
src/elpa1.F90 \
src/elpa1/elpa1.F90 \
src/elpa2.F90 \
src/elpa1_auxiliary.F90 \
src/elpa1_utilities.F90 \
src/elpa1/elpa1_auxiliary.F90 \
src/elpa1/elpa1_utilities.F90 \
src/elpa2_utilities.F90 \
src/elpa_utilities.F90
......@@ -30,7 +30,7 @@ libelpa@SUFFIX@_private_la_SOURCES = \
src/mod_pack_unpack_cpu.F90 \
src/mod_compute_hh_trafo.F90 \
src/aligned_mem.F90 \
src/elpa1_compute_private.F90 \
src/elpa1/elpa1_compute_private.F90 \
src/elpa2_determine_workload.F90 \
src/elpa2_compute.F90 \
src/elpa2_kernels/mod_fortran_interfaces.F90 \
......@@ -46,12 +46,12 @@ libelpa@SUFFIX@_private_la_SOURCES = \
src/elpa_qr/elpa_pdgeqrf.F90
EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
src/elpa_reduce_add_vectors.X90 \
src/elpa_transpose_vectors.X90 \
src/elpa1_compute_template.X90 \
src/elpa1/elpa_reduce_add_vectors.X90 \
src/elpa1/elpa_transpose_vectors.X90 \
src/elpa1/elpa1_compute_template.X90 \
src/elpa2_compute_real_template.X90 \
src/elpa2_compute_complex_template.X90 \
src/elpa1_template.X90 \
src/elpa1/elpa1_template.X90 \
src/elpa2_template.X90 \
src/elpa1_c_interface_template.X90 \
src/elpa2_c_interface_template.X90 \
......@@ -75,10 +75,10 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \
src/compute_hh_trafo.X90 \
src/redist_band.X90 \
src/sanity.X90 \
src/elpa_cholesky_template.X90 \
src/elpa_invert_trm.X90 \
src/elpa_multiply_a_b.X90 \
src/elpa_solve_tridi.X90 \
src/elpa1/elpa_cholesky_template.X90 \
src/elpa1/elpa_invert_trm.X90 \
src/elpa1/elpa_multiply_a_b.X90 \
src/elpa1/elpa_solve_tridi.X90 \
src/precision_macros.h
lib_LTLIBRARIES = libelpa@SUFFIX@.la
......@@ -966,20 +966,20 @@ EXTRA_DIST = \
fdep/fortran_dependencies.pl \
fdep/fortran_dependencies.mk \
test/Fortran/elpa_print_headers.X90 \
src/elpa_reduce_add_vectors.X90 \
src/elpa_transpose_vectors.X90 \
src/elpa1_compute_template.X90 \
src/elpa1_merge_systems_real_template.X90 \
src/elpa1_solve_tridi_real_template.X90 \
src/elpa1_tools_template.X90 \
src/elpa1_trans_ev_template.X90 \
src/elpa1_tridiag_template.X90 \
src/elpa1/elpa_reduce_add_vectors.X90 \
src/elpa1/elpa_transpose_vectors.X90 \
src/elpa1/elpa1_compute_template.X90 \
src/elpa1/elpa1_merge_systems_real_template.X90 \
src/elpa1/elpa1_solve_tridi_real_template.X90 \
src/elpa1/elpa1_tools_template.X90 \
src/elpa1/elpa1_trans_ev_template.X90 \
src/elpa1/elpa1_tridiag_template.X90 \
src/elpa2_compute_real_template.X90 \
src/elpa2_compute_complex_template.X90 \
src/elpa2_bandred_template.X90 \
src/elpa2_herm_matrix_allreduce_complex_template.X90 \
src/elpa2_symm_matrix_allreduce_real_template.X90 \
src/elpa1_template.X90 \
src/elpa1/elpa1_template.X90 \
src/elpa2_template.X90 \
src/elpa1_c_interface_template.X90 \
src/elpa2_c_interface_template.X90 \
......@@ -1001,10 +1001,10 @@ EXTRA_DIST = \
src/pack_unpack_gpu.X90 \
src/compute_hh_trafo.X90 \
src/sanity.X90 \
src/elpa_cholesky_template.X90 \
src/elpa_invert_trm.X90 \
src/elpa_multiply_a_b.X90 \
src/elpa_solve_tridi.X90 \
src/elpa1/elpa_cholesky_template.X90 \
src/elpa1/elpa_invert_trm.X90 \
src/elpa1/elpa_multiply_a_b.X90 \
src/elpa1/elpa_solve_tridi.X90 \
src/elpa_qr/elpa_qrkernels.X90 \
src/ev_tridi_band_gpu_c_v2_complex_template.Xcu \
src/ev_tridi_band_gpu_c_v2_real_template.Xcu \
......
configure.ac
View file @ 74a0c95b
......@@ -4,7 +4,7 @@ AC_PREREQ([2.69])
AC_INIT([elpa],m4_esyscmd_s([awk '/^ *Version:/ {print $2;}' elpa.spec]), [elpa-library@mpcdf.mpg.de])
AC_SUBST([PACKAGE_VERSION])
AC_CONFIG_SRCDIR([src/elpa1.F90])
AC_CONFIG_SRCDIR([src/elpa.F90])
AM_INIT_AUTOMAKE([foreign -Wall subdir-objects])
......
src/elpa1.F90 → src/elpa1/elpa1.F90
View file @ 74a0c95b
......@@ -559,7 +559,7 @@ end function elpa_get_communicators
#define REALCASE 1
#define DOUBLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_template.X90"
#undef REALCASE
#undef DOUBLE_PRECISION
......@@ -603,7 +603,7 @@ end function elpa_get_communicators
#define REALCASE 1
#define SINGLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_template.X90"
#undef REALCASE
#undef SINGLE_PRECISION
......@@ -646,7 +646,7 @@ end function elpa_get_communicators
!> \result success
#define COMPLEXCASE 1
#define DOUBLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_template.X90"
#undef DOUBLE_PRECISION
#undef COMPLEXCASE
......@@ -692,7 +692,7 @@ end function elpa_get_communicators
#define COMPLEXCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_template.X90"
#undef COMPLEXCASE
#undef SINGLE_PRECISION
......
src/elpa1_auxiliary.F90 → src/elpa1/elpa1_auxiliary.F90
View file @ 74a0c95b
......@@ -283,7 +283,7 @@ module ELPA1_AUXILIARY
#define REALCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
function elpa_cholesky_real_double(na, a, lda, nblk, matrixCols, mpi_comm_rows, mpi_comm_cols, &
......@@ -295,7 +295,7 @@ module ELPA1_AUXILIARY
#ifdef WANT_SINGLE_PRECISION_REAL
#define REALCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief cholesky_real_single: Cholesky factorization of a single-precision real symmetric matrix
!> \details
......@@ -324,7 +324,7 @@ module ELPA1_AUXILIARY
#define REALCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_invert_trm_real_double: Inverts a double-precision real upper triangular matrix
!> \details
!> \param na Order of matrix
......@@ -346,7 +346,7 @@ module ELPA1_AUXILIARY
#if WANT_SINGLE_PRECISION_REAL
#define REALCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_invert_trm_real_single: Inverts a single-precision real upper triangular matrix
!> \details
......@@ -371,7 +371,7 @@ module ELPA1_AUXILIARY
#define COMPLEXCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_cholesky_complex_double: Cholesky factorization of a double-precision complex hermitian matrix
!> \details
......@@ -398,7 +398,7 @@ module ELPA1_AUXILIARY
#ifdef WANT_SINGLE_PRECISION_COMPLEX
#define COMPLEXCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_cholesky_complex_single: Cholesky factorization of a single-precision complex hermitian matrix
!> \details
......@@ -425,7 +425,7 @@ module ELPA1_AUXILIARY
#define COMPLEXCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_invert_trm_complex_double: Inverts a double-precision complex upper triangular matrix
!> \details
......@@ -449,7 +449,7 @@ module ELPA1_AUXILIARY
#ifdef WANT_SINGLE_PRECISION_COMPLEX
#define COMPLEXCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_invert_trm_complex_single: Inverts a single-precision complex upper triangular matrix
!> \details
......@@ -474,7 +474,7 @@ module ELPA1_AUXILIARY
#define REALCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief mult_at_b_real_double: Performs C : = A**T * B
!> where A is a square matrix (na,na) which is optionally upper or lower triangular
!> B is a (na,ncb) matrix
......@@ -515,7 +515,7 @@ module ELPA1_AUXILIARY
#if WANT_SINGLE_PRECISION_REAL
#define REALCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_mult_at_b_real_single: Performs C : = A**T * B
!> where A is a square matrix (na,na) which is optionally upper or lower triangular
......@@ -561,7 +561,7 @@ module ELPA1_AUXILIARY
#define COMPLEXCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_mult_ah_b_complex_double: Performs C : = A**H * B
!> where A is a square matrix (na,na) which is optionally upper or lower triangular
......@@ -606,7 +606,7 @@ module ELPA1_AUXILIARY
#ifdef WANT_SINGLE_PRECISION_COMPLEX
#define COMPLEXCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_mult_ah_b_complex_single: Performs C : = A**H * B
!> where A is a square matrix (na,na) which is optionally upper or lower triangular
......@@ -653,7 +653,7 @@ module ELPA1_AUXILIARY
#define REALCASE 1
#define DOUBLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_solve_tridi_double: Solve tridiagonal eigensystem for a double-precision matrix with divide and conquer method
!> \details
......@@ -683,7 +683,7 @@ module ELPA1_AUXILIARY
#ifdef WANT_SINGLE_PRECISION_REAL
#define REALCASE 1
#define SINGLE_PRECISION
#include "precision_macros.h"
#include "../precision_macros.h"
!> \brief elpa_solve_tridi_single: Solve tridiagonal eigensystem for a single-precision matrix with divide and conquer method
!> \details
......
src/elpa1_compute_private.F90 → src/elpa1/elpa1_compute_private.F90
View file @ 74a0c95b
......@@ -157,7 +157,7 @@ module ELPA1_COMPUTE
#define DOUBLE_PRECISION_REAL 1
#define REALCASE 1
#define DOUBLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa_transpose_vectors.X90"
#include "elpa_reduce_add_vectors.X90"
......@@ -168,7 +168,7 @@ module ELPA1_COMPUTE
#define REALCASE 1
#define SINGLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa_transpose_vectors.X90"
#include "elpa_reduce_add_vectors.X90"
......@@ -180,7 +180,7 @@ module ELPA1_COMPUTE
#define COMPLEXCASE 1
#define DOUBLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa_transpose_vectors.X90"
#include "elpa_reduce_add_vectors.X90"
#undef COMPLEXCASE
......@@ -190,7 +190,7 @@ module ELPA1_COMPUTE
#define COMPLEXCASE 1
#define SINGLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa_transpose_vectors.X90"
#include "elpa_reduce_add_vectors.X90"
#undef COMPLEXCASE
......@@ -201,7 +201,7 @@ module ELPA1_COMPUTE
! real double precision
#define REALCASE 1
#define DOUBLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_compute_template.X90"
#undef REALCASE
......@@ -213,7 +213,7 @@ module ELPA1_COMPUTE
#define REALCASE 1
#define SINGLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_compute_template.X90"
#undef REALCASE
......@@ -224,7 +224,7 @@ module ELPA1_COMPUTE
#define COMPLEXCASE 1
#define DOUBLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_compute_template.X90"
#undef COMPLEXCASE
......@@ -235,7 +235,7 @@ module ELPA1_COMPUTE
#define COMPLEXCASE 1
#define SINGLE_PRECISION 1
#include "precision_macros.h"
#include "../precision_macros.h"
#include "elpa1_compute_template.X90"
#undef COMPLEXCASE
......
src/elpa_cholesky_template.X90 → src/elpa1/elpa_cholesky_template.X90
View file @ 74a0c95b
......@@ -42,7 +42,7 @@
! any derivatives of ELPA under the same license that we chose for
! the original distribution, the GNU Lesser General Public License.
#include "sanity.X90"
#include "../sanity.X90"
use elpa1_compute
use elpa_utilities
use elpa_mpi
......
src/elpa_invert_trm.X90 → src/elpa1/elpa_invert_trm.X90
View file @ 74a0c95b
......@@ -50,7 +50,7 @@
! with their original authors, but shall adhere to the licensing terms
! distributed along with the original code in the file "COPYING".
#include "sanity.X90"
#include "../sanity.X90"
use precision
use elpa1_compute
......
src/elpa_multiply_a_b.X90 → src/elpa1/elpa_multiply_a_b.X90
View file @ 74a0c95b
......@@ -53,7 +53,7 @@
! Author: A. Marek, MPCDF
#include "sanity.X90"
#include "../sanity.X90"
#ifdef HAVE_DETAILED_TIMINGS
use timings
......
src/elpa_solve_tridi.X90 → src/elpa1/elpa_solve_tridi.X90
View file @ 74a0c95b
......@@ -54,7 +54,7 @@
#include "sanity.X90"
#include "../sanity.X90"
use elpa1_compute, solve_tridi_&
&PRECISION&
......
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