Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
elpa
elpa
Commits
cf4ee246
Commit
cf4ee246
authored
Aug 03, 2016
by
Andreas Marek
Browse files
Merge branch 'bugfixes_current_release' into ELPA_GPU
parents
db77d245
47823efb
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
cf4ee246
...
...
@@ -2508,3 +2508,27 @@ test_project:
# artifacts:
# paths:
# - coverage_summary
test_project_intel
:
tags
:
-
cpu
script
:
-
mkdir build
-
pushd build
-
../autogen.sh
-
../configure SCALAPACK_LDFLAGS="$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP" SCALAPACK_FCFLAGS="$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP" FC=mpiifort --prefix=$PWD/installdest
-
make -j
8
-
make install
-
popd
-
mkdir test_project/build
-
pushd test_project/build
-
../autogen.sh
-
../configure PKG_CONFIG_PATH=../../build/installdest/lib/pkgconfig FC=mpiifort
-
make -j
8
-
export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
-
./test_real
-
make distclean
-
popd
-
pushd build
-
make distclean
-
rm -rf installdest
Makefile.am
View file @
cf4ee246
...
...
@@ -686,6 +686,15 @@ EXTRA_DIST = \
src/cuUtils_complex_template.Xcu
\
src/cuUtils_real_template.Xcu
\
nvcc_wrap
\
test_project/Makefile.am
\
test_project/aclocal.m4
\
test_project/autogen.sh
\
test_project/config.h.in
\
test_project/configure
\
test_project/configure.ac
\
test_project/fdep
\
test_project/src/test_real.F90
\
test_project/m4
\
elpa.spec
## Rules to re-generated the headers
...
...
src/elpa1.F90
View file @
cf4ee246
...
...
@@ -82,7 +82,7 @@
!> \brief Fortran module which provides the routines to use the one-stage ELPA solver
module
ELPA1
use
precision
use
,
intrinsic
::
iso_c_binding
,
only
:
c_double
use
elpa_utilities
use
elpa1_auxiliary
...
...
src/elpa_utilities.F90
View file @
cf4ee246
...
...
@@ -54,7 +54,6 @@ module ELPA_utilities
#ifdef HAVE_ISO_FORTRAN_ENV
use
iso_fortran_env
,
only
:
error_unit
#endif
use
precision
implicit
none
private
! By default, all routines contained are private
...
...
@@ -62,7 +61,7 @@ module ELPA_utilities
public
::
debug_messages_via_environment_variable
,
pcol
,
prow
,
error_unit
public
::
map_global_array_index_to_local_index
#ifndef HAVE_ISO_FORTRAN_ENV
integer
(
kind
=
ik
)
,
parameter
::
error_unit
=
0
integer
,
parameter
::
error_unit
=
0
#endif
...
...
test_project/src/test_real.F90
View file @
cf4ee246
...
...
@@ -73,9 +73,9 @@ program test_real_example
!
!-------------------------------------------------------------------------------
use
iso_c_binding
use
ELPA1
use
elpa_utilities
,
only
:
error_unit
use
iso_c_binding
#ifdef HAVE_MPI_MODULE
use
mpi
implicit
none
...
...
@@ -90,28 +90,27 @@ program test_real_example
! nev: Number of eigenvectors to be calculated
! nblk: Blocking factor in block cyclic distribution
!-------------------------------------------------------------------------------
! integer, parameter :: ik = C_INT32_T
! integer, parameter :: rk = C_DOUBLE
integer
,
parameter
::
ik
=
C_INT32_T
integer
,
parameter
::
rk
=
C_DOUBLE
integer
(
kind
=
ik
)
::
nblk
integer
(
kind
=
ik
)
::
na
,
nev
integer
::
nblk
integer
::
na
,
nev
integer
(
kind
=
ik
)
::
np_rows
,
np_cols
,
na_rows
,
na_cols
integer
::
np_rows
,
np_cols
,
na_rows
,
na_cols
integer
(
kind
=
ik
)
::
myid
,
nprocs
,
my_prow
,
my_pcol
,
mpi_comm_rows
,
mpi_comm_cols
integer
(
kind
=
ik
)
::
i
,
mpierr
,
my_blacs_ctxt
,
sc_desc
(
9
),
info
,
nprow
,
npcol
integer
::
myid
,
nprocs
,
my_prow
,
my_pcol
,
mpi_comm_rows
,
mpi_comm_cols
integer
::
i
,
mpierr
,
my_blacs_ctxt
,
sc_desc
(
9
),
info
,
nprow
,
npcol
integer
,
external
::
numroc
real
(
kind
=
rk
),
allocatable
::
a
(:,:),
z
(:,:),
ev
(:)
real
(
kind
=
c_double
),
allocatable
::
a
(:,:),
z
(:,:),
ev
(:)
integer
(
kind
=
ik
)
::
iseed
(
4096
)
! Random seed, size should be sufficient for every generator
integer
::
iseed
(
4096
)
! Random seed, size should be sufficient for every generator
integer
(
kind
=
ik
)
::
STATUS
integer
::
STATUS
logical
::
success
character
(
len
=
8
)
::
task_suffix
integer
(
kind
=
ik
)
::
j
integer
::
j
!-------------------------------------------------------------------------------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment