<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/9fd095748d7d1b8a3e2688f22984016aa4670b38">https://github.com/macports/macports-ports/commit/9fd095748d7d1b8a3e2688f22984016aa4670b38</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9fd095748d7d1b8a3e2688f22984016aa4670b38
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Jul 18 06:26:09 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow: update to version 2.12.0; add python 3.10
</span>---
python/py-tensorflow/Portfile | 47 ++++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 25 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 76ed00d3985..6f8c6805639 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;'>@@ -5,10 +5,9 @@ PortGroup python 1.0
</span> PortGroup github 1.0
PortGroup compilers 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcode_workaround 1.0
</span>
name py-tensorflow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.12.0
</span> revision 0
github.setup tensorflow tensorflow ${version} v
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +22,9 @@ homepage https://www.tensorflow.org/
</span>
github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5a7cf86116fb585f08ed119dd758709e2a675b2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3acc1fbb93013f4a8686b0eeb05c8884b35db3480a052b10f49ff07da44d6fd9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59094790
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 26051c2456224f94f82e896aff4cb8512c2f6dc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2b1725eccba5ee42347462f5a65b274a905f7946181fadafc7b44b5c85ba3041 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 69709103
</span>
# Not yet ready for arm
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,32 +39,25 @@ if { ${os.major} < ${min_darwin} } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 1200.0.32.27} {macports-clang-[4-9].0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59192
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode_workaround.type avoid_xcode_compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode_workaround.os_versions 18 19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode_workaround.fixed_xcode_version 11.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 1200.0.32.27} {macports-clang-[4-9].0}
</span>
# Supported python versions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 37 38 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37 38 39 310
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup bazel 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://www.tensorflow.org/install/source#macos for tested bazel versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.version 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup bazel 1.0
</span>
# TF versions 1 and 2 cannot be installed at once
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-tensorflow1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-tensorflow1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Conflicts with tensorflow-macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (${build_arch} eq {arm64} && (${python.version} eq 38 || ${python.version} eq 39))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (${build_arch} eq {x86_64} && ${python.version} eq 38) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Conflicts with tensorflow-macos, tensorflow-metal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${python.version} eq 38 || ${python.version} eq 39 || ${python.version} eq 310 } {
</span> conflicts-append \
py${python.version}-tensorflow-macos \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${python.version}-tensorflow-metal \
</span> py${python.version}-tensorflow_macos
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,10 +71,11 @@ if {${name} ne ${subport}} {
</span> #}
depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cctools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ld64 \
</span> port:py${python.version}-future \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pip \
</span> port:py${python.version}-mock \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pip
</span>
depends_lib-append \
port:py${python.version}-absl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +97,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-wrapt
use_configure yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Options passed to configure script via env vars
bazel::add_to_envs PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
bazel::add_to_envs PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +107,10 @@ if {${name} ne ${subport}} {
</span>
bazel.build_target "//tensorflow/tools/pip_package:build_pip_package"
bazel.post_build_cmd ./bazel-bin/tensorflow/tools/pip_package/build_pip_package [list $workpath]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.extra_build_opts-append --config=opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add -fuse-ld becase https://github.com/tensorflow/tensorflow/issues/58368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.extra_build_opts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --config=opt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --linkopt="-fuse-ld=/usr/bin/ld"
</span>
#bazel.limit_build_jobs no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +131,7 @@ if {${name} ne ${subport}} {
</span> livecheck.type none
# If tensorflow-macos is available for this OS + python version advertise it
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} > 19 && ${python.branch} == 3.8 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} > 19 && ${python.branch} > 3.7 } {
</span> notes "
A hardware accelerated MacOS optimised port of tensorflow from Apple
is available as an alternative to ${subport}. To use run :-
</pre><pre style='margin:0'>
</pre>