<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cf74884fd09ebcf3691a9a3ab627d44c1a0d5735">https://github.com/macports/macports-ports/commit/cf74884fd09ebcf3691a9a3ab627d44c1a0d5735</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cf74884fd09ebcf3691a9a3ab627d44c1a0d5735
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Oct 15 19:42:43 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow : Update to build from source and add 'native' variant to allow builds targeting the host CPU
</span>---
python/py-tensorflow-tensorboard/Portfile | 2 +-
python/py-tensorflow/Portfile | 62 +++++++++++++++++++------------
2 files changed, 40 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-tensorboard/Portfile b/python/py-tensorflow-tensorboard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d15b281..94590f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-tensorboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-tensorboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ if {${python.version} < 30} {
</span> extract.suffix .whl
extract.only
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37
</span>
if {${name} ne ${subport}} {
<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 48177f5..03ee88c 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;'>@@ -2,9 +2,12 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name py-tensorflow
version 1.11.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup tensorflow tensorflow ${version} v
</span> platforms darwin
supported_archs x86_64
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,32 +18,20 @@ long_description ${description}
</span>
homepage https://www.tensorflow.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://files.pythonhosted.org/packages/cp${python.version}/t/tensorflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname tensorflow-${version}-cp${python.version}-cp${python.version}m-macosx_10_11_x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e4f85a516187b7219cb92891b27fc769bb158b6c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 12750d7b5950eb6afff9027099e114ee293cbac9fa0b407fa1405e0dea334be6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59353399
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${python.version} eq 35} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4787c449617b490ef42b7365aa275aa3eadde80d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 27e5c8204e89399b21b5e34a8b01c37c9adc0bde284b818d0dad1d31f0ebe4e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59349901
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${python.version} eq 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 aa2fd5916391c77d6f1012fffbe8b5d8db3981a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b493edf82a840bc4539bc9303ed8ef7188475213e3057822513c892654208a9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59349911
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2d04a8f1c0b0796d4a817f82f5743929bc9a6fb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 55833b40782b636994ef85a875306fc5a4301335342af58eaeb6c37971c68f26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25030426
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .whl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant native description {Build from source for best native platform support} { }
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# tensorflow does not yet support python 3.7 or newer..
</span> python.versions 27 35 36
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bazel
</span>
depends_lib-append \
port:py${python.version}-wheel \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,22 +40,48 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-protobuf3 \
port:py${python.version}-numpy \
port:py${python.version}-mock \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-backports.weakref
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-keras
</span> if {${python.version} < 34} {
depends_lib-append \
port:py${python.version}-enum34
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} < 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-backports.weakref
</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;'>+ use_configure yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Options passed to configure script via env vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset native]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CC_OPT_FLAGS="-march=ivybridge"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove all arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ./configure
</span>
build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build using the wonderful bazel build system ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_bazel_cmd "bazel --max_idle_secs=60 --output_user_root=${workpath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${tf_bazel_cmd} build --config=opt //tensorflow/tools/pip_package:build_pip_package"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build the python wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "./bazel-bin/tensorflow/tools/pip_package/build_pip_package ${workpath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clean up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${tf_bazel_cmd} clean"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macos_minor_v [expr [lindex [split ${os.version} "."] 0] - 4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+
</span> destroot.cmd pip-${python.branch}
destroot.args \
--no-cache-dir \
--no-dependencies \
--root ${destroot} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${install_whlfile}
</span> destroot.post_args
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,5 +89,4 @@ if {${name} ne ${subport}} {
</span> file delete ${destroot}${prefix}/bin/tensorboard-${python.branch}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span> }
</pre><pre style='margin:0'>
</pre>