<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/c8436e882a55e41d835267ae08011dec746e66ad">https://github.com/macports/macports-ports/commit/c8436e882a55e41d835267ae08011dec746e66ad</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 c8436e882a5 ginkgo: update to 1.6.0, improvements to tests
</span>c8436e882a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c8436e882a55e41d835267ae08011dec746e66ad
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Jun 2 11:04:52 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> ginkgo: update to 1.6.0, improvements to tests
</span>---
math/ginkgo/Portfile | 91 +++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 69 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ginkgo/Portfile b/math/ginkgo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37b49e69ad7..e77da603c4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ginkgo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ginkgo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,38 +5,40 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ginkgo-project ginkgo 1.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ginkgo-project ginkgo e3467eb0145c0ac87d20515e0a2bbf4a8b75b228
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.6.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories math parallel
</span> license BSD
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
description Numerical linear algebra software package
long_description A numerical linear algebra library targeting many-core architectures.
homepage https://ginkgo-project.github.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 44582d50b1dcb0108438a52d240eb37be1d936a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3a6bfdbf3d343bdf30c05a1a7ea913d36e15e484cea8afbc509238718ad2076b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9508712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6b76c4fed0f71c0613174ce9e339fb624f1d36cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6bdb29670e8904b079805ea17838675f204b9405dd59213d705e91cdfcf3a89c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12781152
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needed for tests:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.build_type Release
</span>
if {${os.platform} eq "darwin" && ${os.arch} eq "powerpc"} {
mpi.setup require require_fortran \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5 -gcc6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5 \
</span> -clang -fortran
} else {
mpi.setup require require_fortran \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5 -gcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.openmp_version 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:metis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
configure.args-append \
-DBUILD_SHARED_LIBS=ON \
-DGINKGO_MIXED_PRECISION=ON \
-DGINKGO_BUILD_MPI=ON \
-DGINKGO_BUILD_REFERENCE=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGINKGO_BUILD_TESTS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGINKGO_BUILD_TESTS=OFF \
</span> -DGINKGO_BUILD_BENCHMARKS=OFF \
-DGINKGO_BUILD_CUDA=OFF \
-DGINKGO_BUILD_DPCPP=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,18 +52,20 @@ configure.args-append \
</span> -DGINKGO_DOC_GENERATE_PDF=OFF \
-DGINKGO_JACOBI_FULL_OPTIMIZATIONS=OFF \
-DGINKGO_WITH_CCACHE=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGTEST_SRC_DIR=${prefix}/src/googletest/
</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:#ffe0e0;'>-# Even though compilation succeeds, OMP module does not build correctly on PPC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.ccache}} {
</span> configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGINKGO_BUILD_OMP=OFF -DGINKGO_BUILD_OMP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGINKGO_WITH_CCACHE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGINKGO_WITH_CCACHE=ON
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/libomp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ginkgo does not support HWLOC on MacOS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hwloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGINKGO_BUILD_HWLOC=OFF -DGINKGO_BUILD_HWLOC=ON
</span> }
# ___atomic_compare_exchange_8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +73,50 @@ 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;'>-depends_test-append port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openmp description "Use OpenMP" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 3.0
</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;'>+ -DGINKGO_BUILD_OMP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGINKGO_BUILD_OMP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/libomp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lomp
</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;'>+# FIXME: Upstream has broken this in 1.6.0 for Clang.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# default_variants +openmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "Enable testing" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</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;'>+ -DGINKGO_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGINKGO_BUILD_TESTS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGTEST_SRC_DIR=${prefix}/src/googletest/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "powerpc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is some problem with the new hydra on PPC, is freezes at bindings test.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OMP_NUM_THREADS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd ctest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ctest
</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;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: Something in multigrid tests freezes the OS badly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|add_subdirectory(multigrid)||" ${worksrcpath}/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>