diff --git a/comex/configure.ac b/comex/configure.ac index 4611f3c68..8651d3537 100644 --- a/comex/configure.ac +++ b/comex/configure.ac @@ -129,7 +129,7 @@ AC_CHECK_SIZEOF([double]) # Checks for C library functions. AC_FUNC_MMAP COMEX_SEARCH_LIBS([sqrt], [m]) -COMEX_SEARCH_LIBS([sem_open], [rt]) +COMEX_SEARCH_LIBS([sem_open], [pthread]) COMEX_SEARCH_LIBS([shm_open], [rt]) COMEX_SEARCH_LIBS([shm_unlink], [rt]) COMEX_CHECK_FUNCS([bzero]) diff --git a/global/src/scalapack.F b/global/src/scalapack.F index 443043d87..6c56540fc 100644 --- a/global/src/scalapack.F +++ b/global/src/scalapack.F @@ -230,7 +230,7 @@ INTGR4 function slgetmxproc(n,nnodes) INTGR4 nmax,nprocs,twoi double precision nprocs0 double precision otto - parameter(nmax=11,fact=((7108d0*7108d0)/1024d0),otto=8d0) + parameter(nmax=19,fact=((7108d0*7108d0)/1024d0),otto=8d0) cnew parameter(nmax=11,fact=((7108d0*7108d0)/512d0),otto=8d0) c lower bound of 8 procs nprocs0=max((n*n)/fact,otto) @@ -238,7 +238,7 @@ INTGR4 function slgetmxproc(n,nnodes) c try to get powers of two c do i = nmax, 0, -1 - if(nint(nprocs0/(2d0**i)).eq.1) goto 1 + if(nint(nprocs0/(2d0**i)).ge.1) goto 1 enddo i=4 1 twoi=2**i diff --git a/m4/ga_lapack.m4 b/m4/ga_lapack.m4 index 9cc4869bb..0210899a9 100644 --- a/m4/ga_lapack.m4 +++ b/m4/ga_lapack.m4 @@ -88,7 +88,7 @@ AS_IF([test $ga_lapack_ok = no], # Generic LAPACK library? for lib in lapack lapack_rs6k; do AS_IF([test $ga_lapack_ok = no], - [ga_save_LIBS="$LIBS"; LIBS="-l$lib $BLAS_LIBS $LIBS" + [ga_save_LIBS="$LIBS"; LIBS="-l$lib $BLAS_LIBS $LIBS"; LAPACK_LIBS="-l$lib" AS_IF([test "x$enable_f77" = xno], [AC_MSG_CHECKING([for C LAPACK using -l$lib]) AC_LANG_PUSH([C]) diff --git a/travis/install-mpi.sh b/travis/install-mpi.sh index 174ac3f61..759ffba18 100755 --- a/travis/install-mpi.sh +++ b/travis/install-mpi.sh @@ -42,6 +42,21 @@ case "$os" in wget --no-check-certificate http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz tar -xzf mpich-3.2.tar.gz cd mpich-3.2 +cat > mpiimpl.h.patch <