<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4e8848e8fb163e72bac903a9685dba27a41308e0">https://github.com/macports/macports-ports/commit/4e8848e8fb163e72bac903a9685dba27a41308e0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4e8848e8fb1 hiop: update to 1.0.1
</span>4e8848e8fb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4e8848e8fb163e72bac903a9685dba27a41308e0
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Dec 16 04:31:26 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> hiop: update to 1.0.1
</span>---
math/hiop/Portfile | 53 ++++++++++++++++++++++-----
math/hiop/files/patch-no-werror.diff | 11 ++++++
math/hiop/files/patch-strumpack-includes.diff | 10 +++++
3 files changed, 64 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hiop/Portfile b/math/hiop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5491c042d71..25ca0cad86f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hiop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hiop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup github 1.0
</span> PortGroup linear_algebra 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup LLNL hiop 1.0.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup LLNL hiop 1.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math science
license BSD
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ long_description HiOp is an optimization solver for solving certain mathemati
</span> expressed as non-linear programming problems. HiOp is a lightweight HPC solver \
that leverages application’s existing data parallelism to parallelize \
the optimization iterations by using specialized parallel linear algebra kernels.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22edc6342312f0f62c822e9acfc622ccd8fce4fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b6d5216d1b19e4019fd964914a27fa359cf30e1222a7ce584fddc4fe54971ebd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2617343
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dff4069012905b45c6dc0f9056725f76c10154d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18e24abba085ff07b1153aa57c5d9e2d69af42fead92c422a6d0f0750cbec558 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2616964
</span> github.tarball_from archive
depends_lib-append path:share/pkgconfig/eigen3.pc:eigen3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,9 @@ compiler.blacklist-append \
</span> {clang < 900}
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable -Werror: https://github.com/LLNL/hiop/issues/674
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-werror.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Needed in order for correct version of BLAS to be picked:
pre-configure {
configure.args-append ${cmake_linalglib}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,9 +77,33 @@ if {${build_arch} in [list i386 ppc] && [string match *gcc* ${configure.compiler
</span> configure.ldflags-append -latomic
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Ginkgo backend is broken presently: https://github.com/LLNL/hiop/issues/586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: add Raja support. Requires Umpire.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: Ginkgo backend does not build at the moment:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/LLNL/hiop/issues/586
</span> # https://github.com/ginkgo-project/ginkgo/issues/1258
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Raja support requires Umpire.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ginkgo description "Build with Ginkgo backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ginkgo
</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;'>+ -DHIOP_USE_GINKGO=OFF -DHIOP_USE_GINKGO=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 ginkgo 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 "ginkgo 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;'>+ if {![catch {set result [active_variants ginkgo 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 "ginkgo 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>
# Strumpack backend works, but few tests fail: https://github.com/pghysels/STRUMPACK/issues/83
variant strumpack description "Build with STRUMPACK backend" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,10 +113,16 @@ variant strumpack description "Build with STRUMPACK backend" {
</span> port:scotch \
port:strumpack \
port:zfp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-strumpack-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
-DHIOP_USE_STRUMPACK=OFF -DHIOP_USE_STRUMPACK=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/strumpack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![catch {set result [active_variants strumpack mpi]}]} {
if {$result} {
if {![variant_isset mpi]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +140,7 @@ variant strumpack description "Build with STRUMPACK backend" {
</span> }
# Ginkgo will use these too, when enabled:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset strumpack]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset strumpack] || [variant_isset ginkgo]} {
</span> depends_lib-append \
port:metis \
port:scalapack
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hiop/files/patch-no-werror.diff b/math/hiop/files/patch-no-werror.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..affd22aa98e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hiop/files/patch-no-werror.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2023-10-14 04:13:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-12-16 04:09:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CUDA_SEPARABLE_COMPILATION ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_CXX_FLAGS "-Wall -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(CMAKE_CXX_FLAGS "-Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (POLICY CMP0074)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_policy(SET CMP0074 NEW)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hiop/files/patch-strumpack-includes.diff b/math/hiop/files/patch-strumpack-includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..be25883e032
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hiop/files/patch-strumpack-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-10-14 04:13:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-12-12 13:48:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,6 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HIOP_USE_STRUMPACK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(HIOP_STRUMPACK_DIR CACHE PATH "Path to STRUMPACK directory")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(FindHiopSTRUMPACK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(hiop_tpl INTERFACE "__PREFIX__/include/strumpack")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(hiop_tpl INTERFACE STRUMPACK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(STRUMPACK_LIBRARIES AND METIS_LIBRARY)
</span></pre><pre style='margin:0'>
</pre>