Date: Wed, 6 Mar 2013 00:56:02 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313492 - in head/math/spooles: . files Message-ID: <201303060056.r260u2X9099130@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Wed Mar 6 00:56:02 2013 New Revision: 313492 URL: http://svnweb.freebsd.org/changeset/ports/313492 Log: Add a fix to math/spooles from the CalculiX package. PR: 176653 Submitted by: pfg@ Added: head/math/spooles/files/patch-I2Ohash-large-input (contents, props changed) Modified: head/math/spooles/Makefile head/math/spooles/pkg-descr Modified: head/math/spooles/Makefile ============================================================================== --- head/math/spooles/Makefile Wed Mar 6 00:50:28 2013 (r313491) +++ head/math/spooles/Makefile Wed Mar 6 00:56:02 2013 (r313492) @@ -7,7 +7,7 @@ PORTNAME= spooles PORTVERSION= 2.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math MASTER_SITES= http://www.netlib.org/linalg/spooles/ .ifdef WITH_MPI Added: head/math/spooles/files/patch-I2Ohash-large-input ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/spooles/files/patch-I2Ohash-large-input Wed Mar 6 00:56:02 2013 (r313492) @@ -0,0 +1,99 @@ +$FreeBSD$ +--- I2Ohash/src/util.c.orig 2013-03-04 21:21:54.000000000 -0500 ++++ I2Ohash/src/util.c 2012-10-06 08:28:37.000000000 -0500 +@@ -39,8 +39,9 @@ + */ + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; +-loc =(int) loc3; ++/*loc = (loc1*loc2) % hashtable->nlist ;*/ ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc=(int)loc3; + #if MYDEBUG > 0 + fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; + fflush(stdout) ; +@@ -51,7 +52,7 @@ + -------------------------------------------------------- + */ + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; ++fprintf(stdout, "\n hashtable->freeI2OP = %p", hashtable->freeI2OP) ; + fflush(stdout) ; + #endif + if ( (i2op = hashtable->freeI2OP) == NULL ) { +@@ -159,10 +160,11 @@ + #endif + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; +-loc =(int) loc3; ++/*loc = (loc1*loc2) % hashtable->nlist ;*/ ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc=(int)loc3; + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; ++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; + fflush(stdout) ; + #endif + /* +@@ -231,7 +233,9 @@ + } + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-loc = (loc1*loc2) % hashtable->nlist ; ++/*loc = (loc1*loc2) % hashtable->nlist ;*/ ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc=(int)loc3; + /* + --------------------------------------------------- + find the location of the first (key1,key2,*) triple +--- I2Ohash/src/util.c.orig 2013-03-04 21:21:54.000000000 -0500 ++++ I2Ohash/src/util.c 2012-10-06 08:28:37.000000000 -0500 +@@ -39,8 +39,9 @@ + */ + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; +-loc =(int) loc3; ++/*loc = (loc1*loc2) % hashtable->nlist ;*/ ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc=(int)loc3; + #if MYDEBUG > 0 + fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; + fflush(stdout) ; +@@ -51,7 +52,7 @@ + -------------------------------------------------------- + */ + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; ++fprintf(stdout, "\n hashtable->freeI2OP = %p", hashtable->freeI2OP) ; + fflush(stdout) ; + #endif + if ( (i2op = hashtable->freeI2OP) == NULL ) { +@@ -159,10 +160,11 @@ + #endif + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; +-loc =(int) loc3; ++/*loc = (loc1*loc2) % hashtable->nlist ;*/ ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc=(int)loc3; + #if MYDEBUG > 0 +-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; ++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; + fflush(stdout) ; + #endif + /* +@@ -231,7 +233,9 @@ + } + loc1 = (key1 + 1) % hashtable->nlist ; + loc2 = (key2 + 1) % hashtable->nlist ; +-loc = (loc1*loc2) % hashtable->nlist ; ++/*loc = (loc1*loc2) % hashtable->nlist ;*/ ++long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; ++loc=(int)loc3; + /* + --------------------------------------------------- + find the location of the first (key1,key2,*) triple Modified: head/math/spooles/pkg-descr ============================================================================== --- head/math/spooles/pkg-descr Wed Mar 6 00:50:28 2013 (r313491) +++ head/math/spooles/pkg-descr Wed Mar 6 00:56:02 2013 (r313492) @@ -17,4 +17,4 @@ methods. The preconditioner is a drop tolerance factorization, with or without pivoting for stability. -WWW: http://www.spooles.org/ +WWW: http://www.netlib.org/linalg/spooles/spooles.2.2.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303060056.r260u2X9099130>