<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/ffbd9b15a03aabaf62c34a609cb9cc63d7ff59b5">https://github.com/macports/macports-ports/commit/ffbd9b15a03aabaf62c34a609cb9cc63d7ff59b5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ffbd9b15a03aabaf62c34a609cb9cc63d7ff59b5
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Oct 26 07:59:48 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow: Add conflict to tensorflow-macos, supercedes tensorflow_macos
</span>---
python/py-tensorflow/Portfile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 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 fa7ca703130..1d432593666 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;'>@@ -54,15 +54,19 @@ python.versions 37 38 39
</span> if {${name} ne ${subport}} {
PortGroup bazel 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # See https://www.tensorflow.org/install/source#macos for tested bazel versions.
bazel.version 3.7
# TF versions 1 and 2 cannot be installed at once
conflicts py${python.version}-tensorflow1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Conflicts with tensorflow_macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} eq 38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append py${python.version}-tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Conflicts with tensorflow-macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { (${build_arch} eq {arm64} && (${python.version} eq 38 || ${python.version} eq 39))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${build_arch} eq {x86_64} && ${python.version} eq 38) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${python.version}-tensorflow-macos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${python.version}-tensorflow_macos
</span> }
variant mkl description {Enable Intel Math Kernel Library support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,13 +133,13 @@ if {${name} ne ${subport}} {
</span>
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If tensorflow_macos is available for this OS + python version advertise it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If tensorflow-macos is available for this OS + python version advertise it
</span> if { ${os.major} > 19 && ${python.branch} == 3.8 } {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-A hardware accelerated MacOS optimised port of tensorflow from Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A hardware accelerated MacOS optimised port of tensorflow from Apple
</span> is available as an alternative to ${subport}. To use run :-
sudo port uninstall -f ${subport} ${subport}-addons
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port install ${subport}_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port install ${subport}-macos
</span> "
}
</pre><pre style='margin:0'>
</pre>