<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ea9629695819a89e4c9c09f0fa7ae67e00622fbb">https://github.com/macports/macports-ports/commit/ea9629695819a89e4c9c09f0fa7ae67e00622fbb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ea9629695819a89e4c9c09f0fa7ae67e00622fbb
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Jun 11 19:16:23 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> strumpack: fixes and improvements
</span>---
math/strumpack/Portfile | 94 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/strumpack/Portfile b/math/strumpack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76cb6cc4cf4..1c0b7717a62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/strumpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/strumpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup compilers 1.0
PortGroup github 1.0
PortGroup linear_algebra 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpi 1.0
</span>
github.setup pghysels STRUMPACK 7.1.3 v
name strumpack
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +33,7 @@ compilers.setup require_fortran
</span>
# Do not dump all headers into a generic include:
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|DESTINATION include|DESTINATION include/strumpack|g" ${worksrcpath}/CMakeLists.txt ${worksrcpath}/src/CMakeLists.txt
</span> foreach d {BLR clustering dense fortran HODLR HSS iterative kernel matlab misc python sparse structured} {
fs-traverse f ${worksrcpath}/src/${d} {
if {[file isfile ${f}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +91,98 @@ if {[string match *clang* ${configure.compiler}]} {
</span> -lomp
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gklib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:parmetis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:scalapack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:scotch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zfp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gklib openmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:metis openmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPIEXEC_EXECUTABLE=${prefix}/bin/${mpi.exec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSTRUMPACK_USE_MPI=OFF -DSTRUMPACK_USE_MPI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTPL_ENABLE_BPACK=OFF -DTPL_ENABLE_BPACK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTPL_ENABLE_PARMETIS=OFF -DTPL_ENABLE_PARMETIS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTPL_ENABLE_ZFP=OFF -DTPL_ENABLE_ZFP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants bpack mpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "bpack has mpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants bpack openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "bpack has openmpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants parmetis mpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "parmetis has mpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants parmetis openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "parmetis has openmpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants scalapack mpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "scalapack has mpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants scalapack openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "scalapack has openmpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants scotch mpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "scotch has mpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants scotch openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "scotch has openmpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test-append port:wget
# FIXME: There are some failures on ppc: https://github.com/pghysels/STRUMPACK/issues/83
</pre><pre style='margin:0'>
</pre>