Index: head/devel/ga/files/patch-ga_diag_seq =================================================================== --- head/devel/ga/files/patch-ga_diag_seq (revision 534248) +++ head/devel/ga/files/patch-ga_diag_seq (nonexistent) @@ -1,98 +0,0 @@ -Patch https://github.com/edoapra/fedpkg/blob/b5e0c50258cd448b85b146a3752e616ef433946a/ga/ga_diag_seq.patch -suggested by the schience/nwchem upstream to fix the problem in nwchem: -https://github.com/nwchemgit/nwchem/issues/53#issuecomment-415838444 - -diff --git ga-5.6.5/global/src/ga_diag_seq.F ga-5.6.5/global/src/ga_diag_seq.F -index ee60172..7256665 100644 ---- global/src/ga_diag_seq.F -+++ global/src/ga_diag_seq.F -@@ -1,6 +1,11 @@ - #if HAVE_CONFIG_H - # include "config.fh" - #endif -+#if (BLAS_SIZE ==4) -+#define INTGR4 integer*4 -+#else -+#define INTGR4 integer*8 -+#endif - c - c This file has been converted to use LAPACK circa 2011 - c instead of EISPACK circa 1983 by Jeff Hammond circa 2014. -@@ -15,7 +20,7 @@ c - integer g_v ! Global matrix to return evecs - double precision evals(*) ! Local array to return evals - c -- integer n, ierr -+ integer n - #if ENABLE_EISPACK - integer l_fv1, l_fv2, l_v - MA_ACCESS_INDEX_TYPE k_fv1, k_fv2, k_v -@@ -27,6 +32,7 @@ c - integer l_a, l_s - MA_ACCESS_INDEX_TYPE k_a, k_s - integer dim1, dim2, type, me -+ INTGR4 n4,ierr - logical status - c - c -@@ -47,6 +53,7 @@ c - $ call ga_error('ga_diag_seq: nonsquare matrix ',0) - - n = dim1 -+ n4 = n - me = ga_nodeid() - if (me .eq. 0) then - c -@@ -87,7 +94,7 @@ c - call rsg(n, n, dbl_mb(k_a), dbl_mb(k_s), evals, 1, - $ dbl_mb(k_v), dbl_mb(k_fv1), dbl_mb(k_fv2), ierr) - #else -- call dsygv(1,'V','U',n,dbl_mb(k_a),n,dbl_mb(k_s),n, -+ call dsygv(1,'V','U',n4,dbl_mb(k_a),n,dbl_mb(k_s),n4, - $ evals,dbl_mb(k_wrk),n2, ierr) - if (ierr.ne.0) - $ call ga_error('ga_diag_seq: dsygv failed',ierr) -@@ -139,7 +146,7 @@ c - integer g_v ! Global matrix to return evecs - double precision evals(*) ! Local array to return evals - c -- integer n, ierr -+ integer n - #if ENABLE_EISPACK - integer l_fv1, l_fv2, l_v - MA_ACCESS_INDEX_TYPE k_fv1, k_fv2, k_v -@@ -151,6 +158,7 @@ c - integer l_a - MA_ACCESS_INDEX_TYPE k_a - integer dim1, dim2, type, me -+ INTGR4 n4,n2_i4,ierr - logical status - c - c -@@ -170,6 +178,7 @@ c - $ call ga_error('ga_diag_std_seq: nonsquare matrix ',0) - - n = dim1 -+ n4 = n - me = ga_nodeid() - if (me .eq. 0) then - c -@@ -187,6 +196,7 @@ c - #else - c LAPACK fails for n=1 without this - n2 = max(n*n,3*n-1) -+ n2_i4=n2 - status=status.and.ma_push_get(MT_DBL, n2, - $ 'diag_std_seq:wrk', l_wrk, k_wrk) - #endif -@@ -205,8 +215,8 @@ c - call rs(n, n, dbl_mb(k_a), evals, 1, - $ dbl_mb(k_v), dbl_mb(k_fv1), dbl_mb(k_fv2), ierr) - #else -- call dsyev('V', 'L', n, dbl_mb(k_a), n, -- $ evals, dbl_mb(k_wrk), n2, ierr) -+ call dsyev('V', 'L', n4, dbl_mb(k_a), n4, -+ $ evals, dbl_mb(k_wrk), n2_i4, ierr) - if (ierr.ne.0) - $ call ga_error('ga_diag_std_seq: dsyev failed',ierr) - c We used to copy to preserve code symmetry with EISPACK Property changes on: head/devel/ga/files/patch-ga_diag_seq ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ga/Makefile =================================================================== --- head/devel/ga/Makefile (revision 534248) +++ head/devel/ga/Makefile (revision 534249) @@ -1,29 +1,31 @@ # $FreeBSD$ PORTNAME= ga DISTVERSIONPREFIX= v -DISTVERSION= 5.7 -PORTREVISION= 6 +DISTVERSION= 5.7.2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Partitioned Global Address Space (PGAS) library for distributed arrays LICENSE= BMIL LICENSE_NAME= Battelle Memorial Institute License LICENSE_FILE= ${WRKSRC}/COPYRIGHT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack \ - libmpich.so:net/mpich + libmpich.so:net/mpich \ + libscalapack.so:math/scalapack USES= autoreconf fortran gmake libtool localbase USE_GITHUB= yes GH_ACCOUNT= GlobalArrays GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-peigs --enable-shared --disable-static --with-blas4 +CONFIGURE_ARGS= --enable-peigs --enable-shared --disable-static --with-blas4 --with-scalapack INSTALL_TARGET= install-strip USE_LDCONFIG= yes + +LDFLAGS+= -lscalapack .include Index: head/devel/ga/distinfo =================================================================== --- head/devel/ga/distinfo (revision 534248) +++ head/devel/ga/distinfo (revision 534249) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522485129 -SHA256 (GlobalArrays-ga-v5.7_GH0.tar.gz) = 92548ca30c72c54c72b17140f77cc717529acd847d459960c55d54236d6bb73a -SIZE (GlobalArrays-ga-v5.7_GH0.tar.gz) = 5000669 +TIMESTAMP = 1583038685 +SHA256 (GlobalArrays-ga-v5.7.2_GH0.tar.gz) = 40f570d2772e906613698cfd485c5944214147a798705e0dffa4092332100bc9 +SIZE (GlobalArrays-ga-v5.7.2_GH0.tar.gz) = 5002400 Index: head/devel/ga/pkg-plist =================================================================== --- head/devel/ga/pkg-plist (revision 534248) +++ head/devel/ga/pkg-plist (revision 534249) @@ -1,49 +1,49 @@ bin/adjust.x bin/armci-config bin/collisions.x bin/comex-config bin/ga-config include/armci.h include/chemio.h include/comex.h include/coms.h include/dra.fh include/dra.h include/eaf.fh include/eaf.h include/elio.h include/error.h include/farg.h include/ga-mpi.fh include/ga-mpi.h include/ga-papi.h include/ga-wapi.h include/ga.h include/gacommon.h include/global.fh include/macdecls.h include/macommon.h include/maf2c.fh include/mafdecls.fh include/matypes.h include/message.h include/msgtypesc.h include/msgtypesf.h include/parmci.h include/scope.h include/sf.fh include/sf.h include/string-util.h include/table.h include/tcgmsg.fh include/tcgmsg.h include/typesf2c.h lib/libarmci.so lib/libarmci.so.0 lib/libarmci.so.0.0.0 lib/libcomex.so lib/libcomex.so.0 lib/libcomex.so.0.0.0 lib/libga.so lib/libga.so.1 -lib/libga.so.1.1.0 +lib/libga.so.1.1.1