diff --git a/Makefile.am b/Makefile.am index 1e9393cdd02e3716a73777f7ef5b81cd1796fa95..5f719e889c612f58a62d381519a85a072e8bfe23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,6 +110,7 @@ EXTRA_libelpa@SUFFIX@_private_la_DEPENDENCIES = \ src/elpa2/kernels/complex_template.F90 \ src/elpa2/kernels/simple_template.F90 \ src/elpa2/kernels/simple_block4_template.F90 \ + src/elpa2/kernels/simple_block6_template.F90 \ src/elpa2/pack_unpack_cpu.F90 \ src/elpa2/pack_unpack_gpu.F90 \ src/elpa2/compute_hh_trafo.F90 \ @@ -194,9 +195,10 @@ if WITH_REAL_GENERIC_SIMPLE_BLOCK4_KERNEL libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_simple_block4.F90 endif -#if WITH_REAL_GENERIC_SIMPLE_BLOCK6_KERNEL -# libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_simple_block6.F90 -#endif +if WITH_REAL_GENERIC_SIMPLE_BLOCK6_KERNEL + libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_simple_block6.F90 +endif + if WITH_REAL_BGP_KERNEL libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_bgp.f90 endif @@ -802,6 +804,7 @@ EXTRA_DIST = \ src/elpa2/kernels/real_template.F90 \ src/elpa2/kernels/simple_template.F90 \ src/elpa2/kernels/simple_block4_template.F90 \ + src/elpa2/kernels/simple_block6_template.F90 \ src/elpa2/pack_unpack_cpu.F90 \ src/elpa2/pack_unpack_gpu.F90 \ src/elpa2/qr/elpa_pdgeqrf_template.F90 \ diff --git a/ci_test_scripts/run_ci_tests.sh b/ci_test_scripts/run_ci_tests.sh index 51e9087bd7ed2762c3b500674a65a91557e0ace9..e579e1bae526b32cd241519ad2fc07e536a82bb8 100755 --- a/ci_test_scripts/run_ci_tests.sh +++ b/ci_test_scripts/run_ci_tests.sh @@ -150,10 +150,10 @@ then echo " " echo "Exit Code of sbatch: $exitCode" echo " " - if (( $exitCode > 0 )) - then + #if (( $exitCode > 0 )) + #then cat ./ELPA_CI_2gpu.err.* - fi + #fi fi @@ -181,17 +181,17 @@ then echo "Exit Code of sbatch: $exitCode" echo " " cat ./ELPA_CI.out.* - if [ $exitCode -ne 0 ] - then + #if [ $exitCode -ne 0 ] + #then cat ./ELPA_CI.err.* - fi + #fi fi - if [ $exitCode -ne 0 ] - then + #if [ $exitCode -ne 0 ] + #then cat ./test-suite.log - fi + #fi exit $exitCode diff --git a/ci_test_scripts/run_distcheck_tests.sh b/ci_test_scripts/run_distcheck_tests.sh index dff0e4f42130fa191348ded235ddf2c47e53f22d..c6f0b8c3680250fa5fd5a659bc09b821162ccdc7 100755 --- a/ci_test_scripts/run_distcheck_tests.sh +++ b/ci_test_scripts/run_distcheck_tests.sh @@ -126,17 +126,17 @@ then echo "Exit Code of sbatch: $exitCode" echo " " cat ./ELPA_CI.out.* - if [ $exitCode -ne 0 ] - then + #if [ $exitCode -ne 0 ] + #then cat ./ELPA_CI.err.* - fi + #fi fi - if [ $exitCode -ne 0 ] - then + #if [ $exitCode -ne 0 ] + #then cat ./test-suite.log - fi + #fi exit $exitCode diff --git a/ci_test_scripts/run_project_tests.sh b/ci_test_scripts/run_project_tests.sh index dc5219ac62c339a9881442b33c33e9fbe81a7d23..e53e1538fc73798b6c3f9542d7d580cb53cd115a 100755 --- a/ci_test_scripts/run_project_tests.sh +++ b/ci_test_scripts/run_project_tests.sh @@ -129,18 +129,18 @@ then echo "mkdir -p build" >> ./run_${CLUSTER}_1node.sh echo "pushd build" >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running autogen " >> ./run_${CLUSTER}_1node.sh + echo "#Running autogen " >> ./run_${CLUSTER}_1node.sh echo "../autogen.sh" >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running configure " >> ./run_${CLUSTER}_1node.sh + echo "#Running configure " >> ./run_${CLUSTER}_1node.sh echo "../configure " "$configureArgs" >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running make " >> ./run_${CLUSTER}_1node.sh + echo "#Running make " >> ./run_${CLUSTER}_1node.sh echo "make -j 8" >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running make install" >> ./run_${CLUSTER}_1node.sh + echo "#Running make install" >> ./run_${CLUSTER}_1node.sh echo "make install" >> ./run_${CLUSTER}_1node.sh echo "popd" >> ./run_${CLUSTER}_1node.sh echo "mkdir -p $projectName/build" >> ./run_${CLUSTER}_1node.sh @@ -149,19 +149,19 @@ then echo " " >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo " Testting project " >> ./run_${CLUSTER}_1node.sh + echo " #Testting project " >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running autogen " >> ./run_${CLUSTER}_1node.sh + echo "#Running autogen " >> ./run_${CLUSTER}_1node.sh echo "../autogen.sh" >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running configure " >> ./run_${CLUSTER}_1node.sh + echo "#Running configure " >> ./run_${CLUSTER}_1node.sh echo "../configure " "$projectConfigureArgs " >> ./run_${CLUSTER}_1node.sh echo " " >> ./run_${CLUSTER}_1node.sh - echo "Running make " >> ./run_${CLUSTER}_1node.sh + echo "#Running make " >> ./run_${CLUSTER}_1node.sh echo "make -j 8" >> ./run_${CLUSTER}_1node.sh echo "export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:\$LD_LIBRARY_PATH" >> ./run_${CLUSTER}_1node.sh echo "./$projectExecutable" >> ./run_${CLUSTER}_1node.sh @@ -184,18 +184,13 @@ then echo "Exit Code of sbatch: $exitCode" echo " " cat ./ELPA_CI.out.* - if [ $exitCode -ne 0 ] - then + #if [ $exitCode -ne 0 ] + #then cat ./ELPA_CI.err.* - fi + #fi fi - if [ $exitCode -ne 0 ] - then - cat ./test-suite.log - fi - exit $exitCode fi diff --git a/configure.ac b/configure.ac index 43e7dc6e7dbfe11780dc6cf3c132efdb576063f4..b0c7e6ff490eb54277073618ce390490dcb1afd5 100644 --- a/configure.ac +++ b/configure.ac @@ -50,13 +50,15 @@ if test x$_cv_gnu_make_command = x ; then AC_MSG_ERROR([Need GNU Make]) fi +enable_legacy=no + AC_MSG_CHECKING(whether legacy interface should be provided) AC_ARG_ENABLE([legacy-interface], AS_HELP_STRING([--enable-legacy-interface], [build legacy API, default no]), [ if test x"$enableval" = x"yes"; then - enable_legayc=yes + enable_legacy=yes else enable_legacy=no fi @@ -613,6 +615,7 @@ m4_define(elpa_m4_generic_kernels, [ real_generic real_generic_simple real_generic_simple_block4 + real_generic_simple_block6 complex_generic complex_generic_simple ]) diff --git a/elpa/elpa_constants.h.in b/elpa/elpa_constants.h.in index 0af4f2109450ed2d3c75bdee319d2a4c3e042899..4eee46af53b0b82e89a630e1cc21b4e60e1e5603 100644 --- a/elpa/elpa_constants.h.in +++ b/elpa/elpa_constants.h.in @@ -50,7 +50,8 @@ enum ELPA_SOLVERS { X(ELPA_2STAGE_REAL_VSX_BLOCK2, 25, @ELPA_2STAGE_REAL_VSX_BLOCK2_COMPILED@, __VA_ARGS__) \ X(ELPA_2STAGE_REAL_VSX_BLOCK4, 26, @ELPA_2STAGE_REAL_VSX_BLOCK4_COMPILED@, __VA_ARGS__) \ X(ELPA_2STAGE_REAL_VSX_BLOCK6, 27, @ELPA_2STAGE_REAL_VSX_BLOCK6_COMPILED@, __VA_ARGS__) \ - X(ELPA_2STAGE_REAL_GENERIC_SIMPLE_BLOCK4, 28, @ELPA_2STAGE_REAL_GENERIC_SIMPLE_BLOCK4_COMPILED@, __VA_ARGS__) + X(ELPA_2STAGE_REAL_GENERIC_SIMPLE_BLOCK4, 28, @ELPA_2STAGE_REAL_GENERIC_SIMPLE_BLOCK4_COMPILED@, __VA_ARGS__) \ + X(ELPA_2STAGE_REAL_GENERIC_SIMPLE_BLOCK6, 29, @ELPA_2STAGE_REAL_GENERIC_SIMPLE_BLOCK6_COMPILED@, __VA_ARGS__) #define ELPA_FOR_ALL_2STAGE_REAL_KERNELS_AND_DEFAULT(X) \ ELPA_FOR_ALL_2STAGE_REAL_KERNELS(X) \ diff --git a/src/elpa2/legacy_interface/elpa2_utilities.F90 b/src/elpa2/legacy_interface/elpa2_utilities.F90 index 36de326757b65a76e54bd88b7f1170d1a5cf0e4d..2918c3b89cbbb542e79a1c5fd3e8a8f9d76e1b5b 100644 --- a/src/elpa2/legacy_interface/elpa2_utilities.F90 +++ b/src/elpa2/legacy_interface/elpa2_utilities.F90 @@ -56,7 +56,7 @@ module elpa2_utilities implicit none public - integer(kind=c_int), parameter :: number_of_real_kernels = ELPA_2STAGE_NUMBER_OF_REAL_KERNELS - 7 + integer(kind=c_int), parameter :: number_of_real_kernels = ELPA_2STAGE_NUMBER_OF_REAL_KERNELS - 11 integer(kind=c_int), parameter :: number_of_complex_kernels = ELPA_2STAGE_NUMBER_OF_COMPLEX_KERNELS #ifdef WITH_REAL_GENERIC_KERNEL diff --git a/src/elpa_abstract_impl.F90 b/src/elpa_abstract_impl.F90 index cf1527a11cca8bab0b6a9c3efeb1139589c43975..6f4bb56711afaff9259f68a86902c20c03e02f7e 100644 --- a/src/elpa_abstract_impl.F90 +++ b/src/elpa_abstract_impl.F90 @@ -50,7 +50,6 @@ module elpa_abstract_impl use elpa_api use elpa_generated_fortran_interfaces - use elpa_utilities, only : error_unit #ifdef HAVE_DETAILED_TIMINGS use ftimings @@ -98,6 +97,7 @@ module elpa_abstract_impl !> \result error integer, the error code subroutine elpa_set_integer(self, name, value, error) use iso_c_binding + use elpa_utilities, only : error_unit class(elpa_abstract_impl_t) :: self character(*), intent(in) :: name integer(kind=c_int), intent(in) :: value @@ -131,6 +131,7 @@ module elpa_abstract_impl !> \param error integer, optional, to store an error code subroutine elpa_get_integer(self, name, value, error) use iso_c_binding + use elpa_utilities, only : error_unit class(elpa_abstract_impl_t) :: self character(*), intent(in) :: name integer(kind=c_int) :: value @@ -163,6 +164,7 @@ module elpa_abstract_impl !> \result error integer, the error code subroutine elpa_set_double(self, name, value, error) use iso_c_binding + use elpa_utilities, only : error_unit class(elpa_abstract_impl_t) :: self character(*), intent(in) :: name real(kind=c_double), intent(in) :: value @@ -195,6 +197,7 @@ module elpa_abstract_impl !> \param error integer, optional, to store an error code subroutine elpa_get_double(self, name, value, error) use iso_c_binding + use elpa_utilities, only : error_unit class(elpa_abstract_impl_t) :: self character(*), intent(in) :: name real(kind=c_double) :: value diff --git a/test_project_1stage/Makefile.am b/test_project_1stage/Makefile.am index 7f2e0a037741562efd59b4454ef2ca2203ae0113..a810b89593f51ac8154e06c0fd60d07eeae385ad 100644 --- a/test_project_1stage/Makefile.am +++ b/test_project_1stage/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -AM_FCFLAGS = @FC_MODINC@modules @FC_MODOUT@modules $(ELPA_FCFLAGS) +AM_FCFLAGS = @FC_MODINC@modules $(ELPA_FCFLAGS) AM_LDFLAGS = $(ELPA_LIBS) #bindir = $(abs_top_builddir) diff --git a/test_project_1stage/src/test_real.F90 b/test_project_1stage/src/test_real.F90 index 36edeceffca82f0da7ebcd4b1eee5fa10f891dc0..d559654d3fee64e40d8dd0e5cefba4fe986d0987 100644 --- a/test_project_1stage/src/test_real.F90 +++ b/test_project_1stage/src/test_real.F90 @@ -111,7 +111,7 @@ program test_real_example character(len=8) :: task_suffix integer :: j - integer, parameter :: error_unit = 0 + integer, parameter :: error_units = 0 class(elpa_t), pointer :: e !------------------------------------------------------------------------------- @@ -157,12 +157,12 @@ program test_real_example call descinit(sc_desc, na, na, nblk, nblk, 0, 0, my_blacs_ctxt, na_rows, info) if (info .ne. 0) then - write(error_unit,*) 'Error in BLACS descinit! info=',info - write(error_unit,*) 'Most likely this happend since you want to use' - write(error_unit,*) 'more MPI tasks than are possible for your' - write(error_unit,*) 'problem size (matrix size and blocksize)!' - write(error_unit,*) 'The blacsgrid can not be set up properly' - write(error_unit,*) 'Try reducing the number of MPI tasks...' + write(error_units,*) 'Error in BLACS descinit! info=',info + write(error_units,*) 'Most likely this happend since you want to use' + write(error_units,*) 'more MPI tasks than are possible for your' + write(error_units,*) 'problem size (matrix size and blocksize)!' + write(error_units,*) 'The blacsgrid can not be set up properly' + write(error_units,*) 'Try reducing the number of MPI tasks...' call MPI_ABORT(mpi_comm_world, 1, mpierr) endif diff --git a/test_project_1stage_legacy_api/Makefile.am b/test_project_1stage_legacy_api/Makefile.am index 7f2e0a037741562efd59b4454ef2ca2203ae0113..a810b89593f51ac8154e06c0fd60d07eeae385ad 100644 --- a/test_project_1stage_legacy_api/Makefile.am +++ b/test_project_1stage_legacy_api/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -AM_FCFLAGS = @FC_MODINC@modules @FC_MODOUT@modules $(ELPA_FCFLAGS) +AM_FCFLAGS = @FC_MODINC@modules $(ELPA_FCFLAGS) AM_LDFLAGS = $(ELPA_LIBS) #bindir = $(abs_top_builddir) diff --git a/test_project_1stage_legacy_api/src/test_real.F90 b/test_project_1stage_legacy_api/src/test_real.F90 index 577b7a17fcacb4574f83547f607190bcaafe1783..5af26eb8c737da0ada3db47b3ffa3a6d378b5dc3 100644 --- a/test_project_1stage_legacy_api/src/test_real.F90 +++ b/test_project_1stage_legacy_api/src/test_real.F90 @@ -110,7 +110,7 @@ program test_real_example character(len=8) :: task_suffix integer :: j - integer, parameter :: error_unit = 0 + integer, parameter :: error_units = 0 !------------------------------------------------------------------------------- @@ -170,12 +170,12 @@ program test_real_example call descinit(sc_desc, na, na, nblk, nblk, 0, 0, my_blacs_ctxt, na_rows, info) if (info .ne. 0) then - write(error_unit,*) 'Error in BLACS descinit! info=',info - write(error_unit,*) 'Most likely this happend since you want to use' - write(error_unit,*) 'more MPI tasks than are possible for your' - write(error_unit,*) 'problem size (matrix size and blocksize)!' - write(error_unit,*) 'The blacsgrid can not be set up properly' - write(error_unit,*) 'Try reducing the number of MPI tasks...' + write(error_units,*) 'Error in BLACS descinit! info=',info + write(error_units,*) 'Most likely this happend since you want to use' + write(error_units,*) 'more MPI tasks than are possible for your' + write(error_units,*) 'problem size (matrix size and blocksize)!' + write(error_units,*) 'The blacsgrid can not be set up properly' + write(error_units,*) 'Try reducing the number of MPI tasks...' call MPI_ABORT(mpi_comm_world, 1, mpierr) endif @@ -215,7 +215,7 @@ program test_real_example na_cols, mpi_comm_rows, mpi_comm_cols, mpi_comm_world) if (.not.(success)) then - write(error_unit,*) "elpa_solve_evp_real_1stage_double produced an error! Aborting..." + write(error_units,*) "elpa_solve_evp_real_1stage_double produced an error! Aborting..." call MPI_ABORT(mpi_comm_world, 1, mpierr) endif diff --git a/test_project_2stage/Makefile.am b/test_project_2stage/Makefile.am index 47b2a07d5067bb405afc80f0193181f17c1ba4f1..502e657278a8ae5781800c202aecfc9a11337458 100644 --- a/test_project_2stage/Makefile.am +++ b/test_project_2stage/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -AM_FCFLAGS = @FC_MODINC@modules @FC_MODOUT@modules $(ELPA_FCFLAGS) +AM_FCFLAGS = @FC_MODINC@modules $(ELPA_FCFLAGS) AM_LDFLAGS = $(ELPA_LIBS) #bindir = $(abs_top_builddir) diff --git a/test_project_2stage/src/test_real2.F90 b/test_project_2stage/src/test_real2.F90 index f1fdd587f55b6cffcd57fcd8b0df037974b2205e..655b51a2631491b98a3793cdad3cd2af17d87acf 100644 --- a/test_project_2stage/src/test_real2.F90 +++ b/test_project_2stage/src/test_real2.F90 @@ -111,7 +111,7 @@ program test_real_example character(len=8) :: task_suffix integer :: j - integer, parameter :: error_unit = 0 + integer, parameter :: error_units = 0 class(elpa_t), pointer :: e !------------------------------------------------------------------------------- @@ -157,12 +157,12 @@ program test_real_example call descinit(sc_desc, na, na, nblk, nblk, 0, 0, my_blacs_ctxt, na_rows, info) if (info .ne. 0) then - write(error_unit,*) 'Error in BLACS descinit! info=',info - write(error_unit,*) 'Most likely this happend since you want to use' - write(error_unit,*) 'more MPI tasks than are possible for your' - write(error_unit,*) 'problem size (matrix size and blocksize)!' - write(error_unit,*) 'The blacsgrid can not be set up properly' - write(error_unit,*) 'Try reducing the number of MPI tasks...' + write(error_units,*) 'Error in BLACS descinit! info=',info + write(error_units,*) 'Most likely this happend since you want to use' + write(error_units,*) 'more MPI tasks than are possible for your' + write(error_units,*) 'problem size (matrix size and blocksize)!' + write(error_units,*) 'The blacsgrid can not be set up properly' + write(error_units,*) 'Try reducing the number of MPI tasks...' call MPI_ABORT(mpi_comm_world, 1, mpierr) endif diff --git a/test_project_2stage_legacy_api/Makefile.am b/test_project_2stage_legacy_api/Makefile.am index 47b2a07d5067bb405afc80f0193181f17c1ba4f1..502e657278a8ae5781800c202aecfc9a11337458 100644 --- a/test_project_2stage_legacy_api/Makefile.am +++ b/test_project_2stage_legacy_api/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -AM_FCFLAGS = @FC_MODINC@modules @FC_MODOUT@modules $(ELPA_FCFLAGS) +AM_FCFLAGS = @FC_MODINC@modules $(ELPA_FCFLAGS) AM_LDFLAGS = $(ELPA_LIBS) #bindir = $(abs_top_builddir) diff --git a/test_project_2stage_legacy_api/src/test_real2.F90 b/test_project_2stage_legacy_api/src/test_real2.F90 index 8f01c189587502648e8db44a6cfc1291beb51337..eb11ca9cf14cdbf114d0f996d551664e0176f471 100644 --- a/test_project_2stage_legacy_api/src/test_real2.F90 +++ b/test_project_2stage_legacy_api/src/test_real2.F90 @@ -76,7 +76,7 @@ program test_real_example use iso_c_binding use elpa1 use elpa2 - !use elpa_utilities, only : error_unit + !use elpa_utilities, only : error_units #ifdef HAVE_MPI_MODULE use mpi implicit none @@ -111,7 +111,7 @@ program test_real_example character(len=8) :: task_suffix integer :: j - integer, parameter :: error_unit = 0 + integer, parameter :: error_units = 0 !------------------------------------------------------------------------------- @@ -171,12 +171,12 @@ program test_real_example call descinit(sc_desc, na, na, nblk, nblk, 0, 0, my_blacs_ctxt, na_rows, info) if (info .ne. 0) then - write(error_unit,*) 'Error in BLACS descinit! info=',info - write(error_unit,*) 'Most likely this happend since you want to use' - write(error_unit,*) 'more MPI tasks than are possible for your' - write(error_unit,*) 'problem size (matrix size and blocksize)!' - write(error_unit,*) 'The blacsgrid can not be set up properly' - write(error_unit,*) 'Try reducing the number of MPI tasks...' + write(error_units,*) 'Error in BLACS descinit! info=',info + write(error_units,*) 'Most likely this happend since you want to use' + write(error_units,*) 'more MPI tasks than are possible for your' + write(error_units,*) 'problem size (matrix size and blocksize)!' + write(error_units,*) 'The blacsgrid can not be set up properly' + write(error_units,*) 'Try reducing the number of MPI tasks...' call MPI_ABORT(mpi_comm_world, 1, mpierr) endif @@ -216,7 +216,7 @@ program test_real_example na_cols, mpi_comm_rows, mpi_comm_cols, mpi_comm_world) if (.not.(success)) then - write(error_unit,*) "elpa_solve_evp_real_2stage_double produced an error! Aborting..." + write(error_units,*) "elpa_solve_evp_real_2stage_double produced an error! Aborting..." call MPI_ABORT(mpi_comm_world, 1, mpierr) endif diff --git a/test_project_C/Makefile.am b/test_project_C/Makefile.am index 998743ee0f9d71433fe785643ce5cb61977d59a8..52e17c5c489ae309aaebe364d0850bd42dd16fd0 100644 --- a/test_project_C/Makefile.am +++ b/test_project_C/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -AM_FCFLAGS = @FC_MODINC@modules @FC_MODOUT@modules $(ELPA_FCFLAGS) +AM_FCFLAGS = @FC_MODINC@modules $(ELPA_FCFLAGS) AM_CFLAGS = $(ELPA_CFLAGS) AM_LDFLAGS = $(ELPA_LIBS) diff --git a/test_project_C/src/test_blacs_infrastructure.F90 b/test_project_C/src/test_blacs_infrastructure.F90 index 4b89fa3dcd5436b7cdbf550311931d013412571e..ff71a0b009d8b76e5676afdb3931ba090536a8c7 100644 --- a/test_project_C/src/test_blacs_infrastructure.F90 +++ b/test_project_C/src/test_blacs_infrastructure.F90 @@ -92,7 +92,7 @@ module test_blacs_infrastructure np_rows, np_cols, na_rows, & na_cols, sc_desc, my_blacs_ctxt, info) - use elpa_utilities, only : error_unit + !use elpa_utilities, only : error_unit !use test_util implicit none @@ -101,6 +101,7 @@ module test_blacs_infrastructure my_blacs_ctxt, info integer(kind=ik), intent(out) :: na_rows, na_cols, sc_desc(1:9) + integer(kind=ik), parameter :: error_unit=0 #ifdef WITH_MPI integer(kind=ik), external :: numroc integer(kind=ik) :: mpierr diff --git a/test_project_C_2stage/Makefile.am b/test_project_C_2stage/Makefile.am index de7de14eb0f6f48719c1dab2bc261b82f2003c5b..93f1351425ec0cf2952e8f68ac040242ec63d8fa 100644 --- a/test_project_C_2stage/Makefile.am +++ b/test_project_C_2stage/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -AM_FCFLAGS = @FC_MODINC@modules @FC_MODOUT@modules $(ELPA_FCFLAGS) +AM_FCFLAGS = @FC_MODINC@modules $(ELPA_FCFLAGS) AM_CFLAGS = $(ELPA_CFLAGS) AM_LDFLAGS = $(ELPA_LIBS) diff --git a/test_project_C_2stage/src/test_blacs_infrastructure.F90 b/test_project_C_2stage/src/test_blacs_infrastructure.F90 index 4b89fa3dcd5436b7cdbf550311931d013412571e..ff71a0b009d8b76e5676afdb3931ba090536a8c7 100644 --- a/test_project_C_2stage/src/test_blacs_infrastructure.F90 +++ b/test_project_C_2stage/src/test_blacs_infrastructure.F90 @@ -92,7 +92,7 @@ module test_blacs_infrastructure np_rows, np_cols, na_rows, & na_cols, sc_desc, my_blacs_ctxt, info) - use elpa_utilities, only : error_unit + !use elpa_utilities, only : error_unit !use test_util implicit none @@ -101,6 +101,7 @@ module test_blacs_infrastructure my_blacs_ctxt, info integer(kind=ik), intent(out) :: na_rows, na_cols, sc_desc(1:9) + integer(kind=ik), parameter :: error_unit=0 #ifdef WITH_MPI integer(kind=ik), external :: numroc integer(kind=ik) :: mpierr