January 2016 - macports-changes - lists.macosforge.org

[144148] trunk/dports/math/SuiteSparse/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144148 https://trac.macports.org/changeset/144148 Author: mcalhoun(a)macports.org Date: 2016-01-02 23:07:07 -0800 (Sat, 02 Jan 2016) Log Message: ----------- SuiteSparse: add accelerate variant to make it easier to test which BLAS is being used in, e.g., Octave Modified Paths: -------------- trunk/dports/math/SuiteSparse/Portfile Modified: trunk/dports/math/SuiteSparse/Portfile =================================================================== --- trunk/dports/math/SuiteSparse/Portfile 2016-01-03 07:03:08 UTC (rev 144147) +++ trunk/dports/math/SuiteSparse/Portfile 2016-01-03 07:07:07 UTC (rev 144148) @@ -262,7 +262,11 @@ depends_lib-append port:metis } -variant atlas description {Use MacPorts' ATLAS instead of Accelerate Framework} conflicts openblas { +variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas openblas { + depends_lib-append port:vecLibFort +} + +variant atlas description {use BLAS from MacPorts' atlas port} conflicts accelerate openblas { depends_lib-append port:atlas # +atlas requires atlas to be installed without +nofortran @@ -272,7 +276,7 @@ } -variant openblas description {use BLAS from MacPorts' openblas port} conflicts atlas { +variant openblas description {use BLAS from MacPorts' openblas port} conflicts accelerate atlas { depends_lib-append path:lib/libopenblas.dylib:OpenBLAS # LAPACK required @@ -280,5 +284,14 @@ require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack } +if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } { + default_variants-append +accelerate +} + +if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } { + ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n" + return -code error "Invalid variant selection" +} + livecheck.type regex livecheck.regex ${name}-(\\d+(\\.\\d+)*)${extract.suffix}

1 0

[144147] trunk/dports/math/SuiteSparse/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144147 https://trac.macports.org/changeset/144147 Author: mcalhoun(a)macports.org Date: 2016-01-02 23:03:08 -0800 (Sat, 02 Jan 2016) Log Message: ----------- SuiteSparse: add variant to use OpenBlas Modified Paths: -------------- trunk/dports/math/SuiteSparse/Portfile Modified: trunk/dports/math/SuiteSparse/Portfile =================================================================== --- trunk/dports/math/SuiteSparse/Portfile 2016-01-03 06:51:46 UTC (rev 144146) +++ trunk/dports/math/SuiteSparse/Portfile 2016-01-03 07:03:08 UTC (rev 144147) @@ -82,6 +82,8 @@ } else { set BLAS "${prefix}/lib/libsatlas.dylib" } + } elseif {[variant_isset openblas]} { + set BLAS "${prefix}/lib/libopenblas.dylib" } reinplace "s|@BLAS_LAPACK@|${BLAS}|g" ${makefile} @@ -133,6 +135,8 @@ } else { set atlas "-lsatlas" } + } elseif {[variant_isset openblas]} { + set atlas "-lopenblas" } set major [join [lrange [split ${version} .] 0 0] .] @@ -258,7 +262,7 @@ depends_lib-append port:metis } -variant atlas description {Use MacPorts' ATLAS instead of Accelerate Framework} { +variant atlas description {Use MacPorts' ATLAS instead of Accelerate Framework} conflicts openblas { depends_lib-append port:atlas # +atlas requires atlas to be installed without +nofortran @@ -268,5 +272,13 @@ } +variant openblas description {use BLAS from MacPorts' openblas port} conflicts atlas { + depends_lib-append path:lib/libopenblas.dylib:OpenBLAS + + # LAPACK required + PortGroup active_variants 1.1 + require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack +} + livecheck.type regex livecheck.regex ${name}-(\\d+(\\.\\d+)*)${extract.suffix}

1 0

[144146] trunk/dports/math/qrupdate/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144146 https://trac.macports.org/changeset/144146 Author: mcalhoun(a)macports.org Date: 2016-01-02 22:51:46 -0800 (Sat, 02 Jan 2016) Log Message: ----------- qrupdate: ensure at least one BLAS implementation is chosen Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2016-01-03 06:51:03 UTC (rev 144145) +++ trunk/dports/math/qrupdate/Portfile 2016-01-03 06:51:46 UTC (rev 144146) @@ -97,6 +97,11 @@ default_variants-append +accelerate } +if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } { + ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n" + return -code error "Invalid variant selection" +} + if {[variant_isset g95]} { post-patch { reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile

1 0

[144145] trunk/dports/math/qrupdate/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144145 https://trac.macports.org/changeset/144145 Author: mcalhoun(a)macports.org Date: 2016-01-02 22:51:03 -0800 (Sat, 02 Jan 2016) Log Message: ----------- qrupdate: make the default BLAS the Accelerate framework atlas became the default BLAS in r68235 due to allow 32/64-bit universal build this is no longer a compelling reason (Accelerate is universal) by a slim majority, Accelerate seems is the default BLAS in other ports, so be consistent Revision Links: -------------- https://trac.macports.org/changeset/68235 Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2016-01-03 06:26:10 UTC (rev 144144) +++ trunk/dports/math/qrupdate/Portfile 2016-01-03 06:51:03 UTC (rev 144145) @@ -93,18 +93,16 @@ test.args-append BLAS=-lopenblas LAPACK=-lopenblas } +if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } { + default_variants-append +accelerate +} + if {[variant_isset g95]} { - if {![variant_isset atlas]} { - default_variants-append +accelerate - } post-patch { reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile } } else { - if {![variant_isset accelerate]} { - default_variants-append +atlas - } post-patch { reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf }

1 0

[144144] trunk/dports/math/qrupdate/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144144 https://trac.macports.org/changeset/144144 Author: mcalhoun(a)macports.org Date: 2016-01-02 22:26:10 -0800 (Sat, 02 Jan 2016) Log Message: ----------- qrupdate: simplify atlas variant link command to be consistent with other variants Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2016-01-03 06:13:18 UTC (rev 144143) +++ trunk/dports/math/qrupdate/Portfile 2016-01-03 06:26:10 UTC (rev 144144) @@ -69,9 +69,9 @@ variant atlas conflicts accelerate openblas description {build with atlas instead of Accelerate framework} { depends_lib-append port:atlas - build.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack" - destroot.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack" - test.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack" + build.args-append BLAS=-ltatlas LAPACK=-llapack + destroot.args-append BLAS=-ltatlas LAPACK=-llapack + test.args-append BLAS=-ltatlas LAPACK=-llapack } variant accelerate conflicts atlas openblas description {build with Accelerate framework} {

1 0

propchange - r144142 svn:log
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Author: mcalhoun(a)macports.org (original author: mcalhoun(a)macports.org) Revision: 144142 Property Name: svn:log --- /var/tmp/revprops/pre-144142-mcalhoun(a)macports.org 2016-01-02 22:15:27.166269767 -0800 +++ /var/tmp/revprops/post-144142-mcalhoun(a)macports.org 2016-01-02 22:15:27.290523566 -0800 @@ -1 +1 @@ -qrupdate: add variant to select OpenBlas +qrupdate: add variant to select OpenBlas (has typo fixed in r144143)

1 0

[144143] trunk/dports/math/qrupdate/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144143 https://trac.macports.org/changeset/144143 Author: mcalhoun(a)macports.org Date: 2016-01-02 22:13:18 -0800 (Sat, 02 Jan 2016) Log Message: ----------- qrupdate: fix typo in r144142 Revision Links: -------------- https://trac.macports.org/changeset/144142 Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2016-01-03 06:09:12 UTC (rev 144142) +++ trunk/dports/math/qrupdate/Portfile 2016-01-03 06:13:18 UTC (rev 144143) @@ -90,7 +90,7 @@ build.args-append BLAS=-lopenblas LAPACK=-lopenblas destroot.args-append BLAS=-lopenblas LAPACK=-lopenblas - test.args-append BLAS=-lvecLibFort LAPACK=-lvecLibFort + test.args-append BLAS=-lopenblas LAPACK=-lopenblas } if {[variant_isset g95]} {

1 0

[144142] trunk/dports/math/qrupdate/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144142 https://trac.macports.org/changeset/144142 Author: mcalhoun(a)macports.org Date: 2016-01-02 22:09:12 -0800 (Sat, 02 Jan 2016) Log Message: ----------- qrupdate: add variant to select OpenBlas Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2016-01-03 06:01:03 UTC (rev 144141) +++ trunk/dports/math/qrupdate/Portfile 2016-01-03 06:09:12 UTC (rev 144142) @@ -67,20 +67,32 @@ } } -variant atlas conflicts accelerate description {build with atlas instead of Accelerate framework} { +variant atlas conflicts accelerate openblas description {build with atlas instead of Accelerate framework} { depends_lib-append port:atlas build.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack" destroot.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack" test.args-append BLAS="-L${prefix}/lib -ltatlas" LAPACK="-L${prefix}/lib -llapack" } -variant accelerate conflicts atlas description {build with Accelerate framework} { +variant accelerate conflicts atlas openblas description {build with Accelerate framework} { depends_lib-append port:vecLibFort build.args-append BLAS=-lvecLibFort LAPACK="-framework Accelerate" destroot.args-append BLAS=-lvecLibFort LAPACK="-framework Accelerate" test.args-append BLAS=-lvecLibFort LAPACK="-framework Accelerate" } +variant openblas conflicts accelerate atlas description {build with Accelerate framework} { + PortGroup active_variants 1.1 + + depends_lib-append path:lib/libopenblas.dylib:OpenBLAS + # LAPACK required + require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack + + build.args-append BLAS=-lopenblas LAPACK=-lopenblas + destroot.args-append BLAS=-lopenblas LAPACK=-lopenblas + test.args-append BLAS=-lvecLibFort LAPACK=-lvecLibFort +} + if {[variant_isset g95]} { if {![variant_isset atlas]} { default_variants-append +accelerate

1 0

[144141] trunk/dports/math/qrupdate/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144141 https://trac.macports.org/changeset/144141 Author: mcalhoun(a)macports.org Date: 2016-01-02 22:01:03 -0800 (Sat, 02 Jan 2016) Log Message: ----------- qrupdate: add ability to run self-diagnostic Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2016-01-03 05:58:00 UTC (rev 144140) +++ trunk/dports/math/qrupdate/Portfile 2016-01-03 06:01:03 UTC (rev 144141) @@ -97,3 +97,5 @@ reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf } } + +test.run yes

1 0

[144140] trunk/dports/math/arpack/Portfile
by mcalhoun＠macports.org 03 Jan '16

03 Jan '16

Revision: 144140 https://trac.macports.org/changeset/144140 Author: mcalhoun(a)macports.org Date: 2016-01-02 21:58:00 -0800 (Sat, 02 Jan 2016) Log Message: ----------- arpack: ensure at least one BLAS implementation is chosen Modified Paths: -------------- trunk/dports/math/arpack/Portfile Modified: trunk/dports/math/arpack/Portfile =================================================================== --- trunk/dports/math/arpack/Portfile 2016-01-03 05:56:19 UTC (rev 144139) +++ trunk/dports/math/arpack/Portfile 2016-01-03 05:58:00 UTC (rev 144140) @@ -84,6 +84,11 @@ default_variants +accelerate } +if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } { + ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n" + return -code error "Invalid variant selection" +} + post-destroot { reinplace "s|/usr|${prefix}|g" ${destroot}${prefix}/lib/pkgconfig/arpack.pc }

1 0