Date: Sat, 30 Mar 2013 14:29:40 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315618 - in head/math/petsc: . files Message-ID: <201303301429.r2UETehm051703@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Sat Mar 30 14:29:40 2013 New Revision: 315618 URL: http://svnweb.freebsd.org/changeset/ports/315618 Log: fix the build after the math/suitesparse update Reported by: miwi Approved by: portmgr Added: head/math/petsc/files/patch-src__mat__impls__aij__seq__umfpack__umfpack.c (contents, props changed) Modified: head/math/petsc/Makefile (contents, props changed) head/math/petsc/pkg-descr (contents, props changed) Modified: head/math/petsc/Makefile ============================================================================== --- head/math/petsc/Makefile Sat Mar 30 14:16:01 2013 (r315617) +++ head/math/petsc/Makefile Sat Mar 30 14:29:40 2013 (r315618) @@ -1,13 +1,9 @@ -# New ports collection makefile for: petsc -# Date created: 25 September 2004 -# Whom: Thierry Thomas <thierry@pompo.net> -# +# Created by: Thierry Thomas <thierry@pompo.net> # $FreeBSD$ -# PORTNAME= petsc DISTVERSION= 2.3.3-p0 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= math parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ @@ -51,9 +47,9 @@ TARGET= ${OPSYS:L} PLIST_SUB= PFX=${PFX} TARGET=${TARGET} .if !defined(WITHOUT_UMFPACK) -UMFPACK_LIBS= umfpack.so,cholmod.so,colamd.so,amd.so +UMFPACK_LIBS= umfpack.so,cholmod.so,colamd.so,amd.so,suitesparseconfig.so L=${LOCALBASE}/lib/lib -LIB_DEPENDS+= umfpack.1:${PORTSDIR}/math/suitesparse +LIB_DEPENDS+= umfpack:${PORTSDIR}/math/suitesparse CONFIGURE_ARGS+= --with-umfpack-include="${LOCALBASE}/include/suitesparse" \ --with-umfpack-lib="[${UMFPACK_LIBS:C/^/${L}/:C/,/, ${L}/g}]" .endif @@ -122,11 +118,11 @@ PLIST_SUB+= MPIUNI="" WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) -LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas +LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas LIBBLASLAPACK= -L${LOCALBASE}/lib -lalapack -lcblas -lf77blas CONFIGURE_ARGS+= --with-blas-lapack-lib="${LIBBLASLAPACK}" .else -LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack +LIB_DEPENDS+= lapack:${PORTSDIR}/math/lapack LIBBLASLAPACK= -L${LOCALBASE}/lib -llapack -lblas CONFIGURE_ARGS+= --with-blas-lapack-lib="${LIBBLASLAPACK}" .endif @@ -160,7 +156,7 @@ CONFLICTS+= metis-4* WITH_BLACS= yes .endif .if defined(WITH_BLACS) && defined(WITH_MPI) -LIB_DEPENDS+= blacs.1:${PORTSDIR}/math/blacs +LIB_DEPENDS+= blacs:${PORTSDIR}/math/blacs CONFIGURE_ARGS+= --with_blacs=1 \ --with-blacs-include=${LOCALBASE}/include \ --with-blacs-lib=[${LOCALBASE}/lib/libblacsc.a,${LOCALBASE}/lib/libblacsf77.a,${LOCALBASE}/lib/libblacs.a] @@ -168,7 +164,7 @@ CONFIGURE_ARGS+= --with_blacs=1 \ WITH_SCALAPACK= yes . endif . if defined(WITH_SCALAPACK) -LIB_DEPENDS+= scalapack.1:${PORTSDIR}/math/scalapack +LIB_DEPENDS+= scalapack:${PORTSDIR}/math/scalapack CONFIGURE_ARGS+= --with-scalapack=1 \ --with-scalapack-dir=${LOCALBASE} . endif Added: head/math/petsc/files/patch-src__mat__impls__aij__seq__umfpack__umfpack.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/petsc/files/patch-src__mat__impls__aij__seq__umfpack__umfpack.c Sat Mar 30 14:29:40 2013 (r315618) @@ -0,0 +1,34 @@ +--- src/mat/impls/aij/seq/umfpack/umfpack.c.orig 2013-03-30 09:30:52.000000000 -0400 ++++ src/mat/impls/aij/seq/umfpack/umfpack.c 2013-03-30 09:32:20.000000000 -0400 +@@ -153,7 +153,7 @@ + PetscErrorCode ierr; + int m=A->rmap.n,n=A->cmap.n,*ai=mat->i,*aj=mat->j,status,*ra,idx; + PetscScalar *av=mat->a; +- const char *strategy[]={"AUTO","UNSYMMETRIC","SYMMETRIC","2BY2"}, ++ const char *strategy[]={"AUTO","UNSYMMETRIC","SYMMETRIC"}, + *scale[]={"NONE","SUM","MAX"}; + PetscTruth flg; + +@@ -189,14 +189,12 @@ + case 0: lu->Control[UMFPACK_STRATEGY] = UMFPACK_STRATEGY_AUTO; break; + case 1: lu->Control[UMFPACK_STRATEGY] = UMFPACK_STRATEGY_UNSYMMETRIC; break; + case 2: lu->Control[UMFPACK_STRATEGY] = UMFPACK_STRATEGY_SYMMETRIC; break; +- case 3: lu->Control[UMFPACK_STRATEGY] = UMFPACK_STRATEGY_2BY2; break; + } + } + ierr = PetscOptionsReal("-mat_umfpack_dense_col","Control[UMFPACK_DENSE_COL]","None",lu->Control[UMFPACK_DENSE_COL],&lu->Control[UMFPACK_DENSE_COL],PETSC_NULL);CHKERRQ(ierr); + ierr = PetscOptionsReal("-mat_umfpack_dense_row","Control[UMFPACK_DENSE_ROW]","None",lu->Control[UMFPACK_DENSE_ROW],&lu->Control[UMFPACK_DENSE_ROW],PETSC_NULL);CHKERRQ(ierr); + ierr = PetscOptionsReal("-mat_umfpack_amd_dense","Control[UMFPACK_AMD_DENSE]","None",lu->Control[UMFPACK_AMD_DENSE],&lu->Control[UMFPACK_AMD_DENSE],PETSC_NULL);CHKERRQ(ierr); + ierr = PetscOptionsReal("-mat_umfpack_block_size","Control[UMFPACK_BLOCK_SIZE]","None",lu->Control[UMFPACK_BLOCK_SIZE],&lu->Control[UMFPACK_BLOCK_SIZE],PETSC_NULL);CHKERRQ(ierr); +- ierr = PetscOptionsReal("-mat_umfpack_2by2_tolerance","Control[UMFPACK_2BY2_TOLERANCE]","None",lu->Control[UMFPACK_2BY2_TOLERANCE],&lu->Control[UMFPACK_2BY2_TOLERANCE],PETSC_NULL);CHKERRQ(ierr); + ierr = PetscOptionsReal("-mat_umfpack_fixq","Control[UMFPACK_FIXQ]","None",lu->Control[UMFPACK_FIXQ],&lu->Control[UMFPACK_FIXQ],PETSC_NULL);CHKERRQ(ierr); + ierr = PetscOptionsReal("-mat_umfpack_aggressive","Control[UMFPACK_AGGRESSIVE]","None",lu->Control[UMFPACK_AGGRESSIVE],&lu->Control[UMFPACK_AGGRESSIVE],PETSC_NULL);CHKERRQ(ierr); + +@@ -291,7 +289,6 @@ + ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_DENSE_ROW]: %g\n",lu->Control[UMFPACK_DENSE_ROW]);CHKERRQ(ierr); + ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_AMD_DENSE]: %g\n",lu->Control[UMFPACK_AMD_DENSE]);CHKERRQ(ierr); + ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_BLOCK_SIZE]: %g\n",lu->Control[UMFPACK_BLOCK_SIZE]);CHKERRQ(ierr); +- ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_2BY2_TOLERANCE]: %g\n",lu->Control[UMFPACK_2BY2_TOLERANCE]);CHKERRQ(ierr); + ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_FIXQ]: %g\n",lu->Control[UMFPACK_FIXQ]);CHKERRQ(ierr); + ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_AGGRESSIVE]: %g\n",lu->Control[UMFPACK_AGGRESSIVE]);CHKERRQ(ierr); + Modified: head/math/petsc/pkg-descr ============================================================================== --- head/math/petsc/pkg-descr Sat Mar 30 14:16:01 2013 (r315617) +++ head/math/petsc/pkg-descr Sat Mar 30 14:29:40 2013 (r315618) @@ -6,4 +6,4 @@ techniques and Krylov subspace methods. matrix formats, including compressed row, block compressed row, and block diagonal storage. -WWW: http://www.mcs.anl.gov/petsc/ +WWW: http://www.mcs.anl.gov/petsc/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303301429.r2UETehm051703>