<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8bb14b9bac129ca0ecc83630b1c8bc82a06e861">https://github.com/macports/macports-ports/commit/b8bb14b9bac129ca0ecc83630b1c8bc82a06e861</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b8bb14b9bac129ca0ecc83630b1c8bc82a06e861
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Apr 25 01:57:55 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> hpddm: update to 2.2.3
</span>---
math/hpddm/Portfile | 45 +++++++++++++++++++-------------
math/hpddm/files/patch-install_name.diff | 10 ++++---
2 files changed, 33 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hpddm/Portfile b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e4c427dc60c..fc0054b7068 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,25 +7,27 @@ PortGroup linear_algebra 1.0
</span> PortGroup makefile 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup hpddm hpddm 21c972f2488edbbd4948c937d7c929b38de9def7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see ${worksrcpath}/include/HPDDM_define.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup hpddm hpddm 2.2.3 v
</span> epoch 1
categories math science
license LGPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mcalhoun @MarcusCalhoun-Lopez} {@catap korins.ky:kirill} openmaintainer
</span> platforms darwin
description a framework for high-performance domain decomposition methods
long_description HPDDM is an efficient implementation of various domain decomposition methods.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 03473e1661ffe0fa8c9dd4bf326b53ef20e5c87a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c855c9fdb529ba9aa5861122fed83a08f5b1653f11055fb0b9d7e2d90f7f6025 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 280267
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1adae7d425bb99046433d079c6082db3c60dd138 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ca9c1ca9984f7efaef61a388e4333383bd0e83058c5cea8299a61540f1924f6b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 321484
</span>
mpi.setup require require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+linalg.setup blas_only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:python${python_version} \
</span> port:mumps \
port:arpack \
port:scalapack \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,23 +42,30 @@ muniversal.arch_tools MPICXX \
</span> MPIF90
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/Make.inc/Makefile.OSX ${worksrcpath}/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/Make.inc/Makefile.macOS ${worksrcpath}/Makefile.inc
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-build {
build.args-append MPICXX=${mpi.cxx} \
MPICC=${mpi.cc} \
MPIF90=${mpi.f90} \
MPIRUN="${prefix}/bin/${mpi.exec} -np" \
MUMPS_INCS=-I${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_INCS=-I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLAS_LIBS="-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_INCS=-I${frameworks_dir}/Python.framework/Versions/${python_branch}/include/python${python_branch} \
</span> ARPACK_LIBS="-L${prefix}/lib -larpack" \
SCALAPACK_LIBS="-L${prefix}/lib -lscalapack" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MUMPS_LIBS="-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUMPS_LIBS="-L${prefix}/lib -lmumps_common -lesmumps -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
</span> HYPRE_LIBS="-L${prefix}/lib -lHYPRE" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIBS="-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIBS="-L${frameworks_dir}/Python.framework/Versions/${python_branch}/lib -lpython${python_branch}" \
</span> VERSION=${version} \
CVERSION=[join [lrange [split ${version} .] 0 0] .]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENBLAS_LIBS="-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLAS_LIBS="-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Makefile searches for gfortran in $(MPIF90) name, which is not always true
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,12 +84,12 @@ destroot {
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_test-append port:py27-mpi4py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-scipy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:py${python_version}-mpi4py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-scipy
</span>
pre-test {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.args-append PATH=${frameworks_dir}/Python.framework/Versions/2.7/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.args-append PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin:$env(PATH)
</span> }
github.livecheck.branch main
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hpddm/files/patch-install_name.diff b/math/hpddm/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fbebb5047ef..b34b293586e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hpddm/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hpddm/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2018-09-18 00:52:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-11-10 09:25:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,11 +261,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Makefile Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3a72783..f80def4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,11 +261,11 @@ benchmark/local_solver:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${TOP_DIR}/${LIB_DIR}/lib%.${EXTENSION_LIB}: interface/%.cpp ${TOP_DIR}/${TRASH_DIR}/%.d ${TOP_DIR}/${TRASH_DIR}/compiler_flags_cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${TOP_DIR}/${LIB_DIR}/lib%.${EXTENSION_LIB}: interface/%.cpp ${TOP_DIR}/${TRASH_DIR}/lib%.d ${TOP_DIR}/${TRASH_DIR}/compiler_flags_cpp
</span> @if [ "$<" = "interface/hpddm_python.cpp" ]; then \
- echo ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
- ${MPICXX} ${DEPFLAGS} ${CXXFLAGS} ${HPDDMFLAGS} ${INCS} ${PYTHON_INCS} -shared $< -o $@ ${LIBS} ${PYTHON_LIBS}; \
</pre><pre style='margin:0'>
</pre>