<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/42ff42ce12bca1cf8294d5062a4f416b037e2357">https://github.com/macports/macports-ports/commit/42ff42ce12bca1cf8294d5062a4f416b037e2357</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 42ff42ce12bca1cf8294d5062a4f416b037e2357
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu May 7 18:00:03 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow: update to 2.2.0
</span>---
python/py-tensorflow/Portfile | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bd68f8..44bd181 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup xcode_workaround 1.0
name py-tensorflow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> github.setup tensorflow tensorflow ${version} v
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ homepage https://www.tensorflow.org/
</span>
github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 476dd5e51924d966cfed30ce5deb0f12d6d6bad8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c6d97f622fffdcf318b45f705368eb2d32446ca4f4ed86c8b06083559ff55cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 46183179
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 53b38674e167f00d13eacef4ac7da5c8a364f1f6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 92b44979b36ab6a9760a777b5faba50df20ad5a9d590f02fa3084e06d8901791 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 42104809
</span>
if { ${os.major} < 16 } {
known_fail yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,10 +48,10 @@ patch.pre_args -p1
</span> # Required java version
java.version 11+
# JDK port to install if required java not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback openjdk13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback openjdk14
</span> # JDK only needed at build time, but java PG sets lib dependency so
# declare no conflict to allow redistribution of binaries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict openjdk13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict ${java.fallback}
</span>
# The oldest Xcode version to use default Xcode compiler
# Note setting here should be in sync with that in bazel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,17 +63,22 @@ if {${os.major} < 16} {
</span> patchfiles-append CLOCK_REALTIME-Older-OSX.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mkl description {Enable Intel Math Kernel Library support} { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enable MKL by default on 10.12 and newer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +mkl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mkl description {Enable Intel Math Kernel Library support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Not obvious if this dep is needed ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #depends_lib-append port:libomp
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Enable MKL by default on 10.12 and newer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Currently not working due to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# external/mkl_dnn_v1/src/common/dnnl_thread.hpp:42:10: fatal error: 'omp.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# default_variants-append +mkl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span>
variant native description {Build from source for best native platform support} { }
# Support python versions
python.versions 37 38
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 38
</span>
if {${name} ne ${subport}} {
conflicts py${python.version}-tensorflow1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +87,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-future \
port:py${python.version}-pip \
port:py${python.version}-mock \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bazel26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bazel-2.0 \
</span> port:cctools
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,6 +187,8 @@ if {${name} ne ${subport}} {
</span> }
if {[variant_isset mkl]} {
set tf_bazel_build_opts "${tf_bazel_build_opts} --config=mkl"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Is this required ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #set tf_bazel_build_opts "${tf_bazel_build_opts} --cxxopt '-I${prefix}/include/libomp' --linkopt '-L${prefix}/lib/libomp'"
</span> }
if {![variant_isset native]} {
set tf_bazel_build_opts "${tf_bazel_build_opts} --copt=${base_march}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +202,7 @@ if {${name} ne ${subport}} {
</span> }
set macos_minor_v [expr [lindex [split ${os.version} "."] 0] - 4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set install_whlfile ${workpath}/tensorflow-${version}-cp${python.version}-cp${python.version}m-macosx_10_${macos_minor_v}_x86_64.whl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set install_whlfile ${workpath}/tensorflow-${version}-cp${python.version}-cp${python.version}-macosx_10_${macos_minor_v}_x86_64.whl
</span>
destroot.cmd pip-${python.branch}
destroot.args \
</pre><pre style='margin:0'>
</pre>