<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/d3bf0b9b1edffbd4113290404c1c6d8d2b576f43">https://github.com/macports/macports-ports/commit/d3bf0b9b1edffbd4113290404c1c6d8d2b576f43</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d3bf0b9b1edffbd4113290404c1c6d8d2b576f43
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Sun Oct 6 20:49:09 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow1: new port copied from version 1.14.0 of py-tensorflow.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/59179
</span>---
python/py-tensorflow/Portfile | 1 +
python/{py-tensorflow => py-tensorflow1}/Portfile | 23 +++++++++--------
.../files/CLOCK_REALTIME-Older-OSX.patch | 30 ++++++++++++++++++++++
3 files changed, 43 insertions(+), 11 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 76c072b..97e8449 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;'>@@ -62,6 +62,7 @@ python.versions 27 35 36 37
</span> python.default_version 37
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-tensorflow1
</span>
depends_build-append \
port:py${python.version}-future \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow1/Portfile
</span>similarity index 94%
copy from python/py-tensorflow/Portfile
copy to python/py-tensorflow1/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 76c072b..545634b 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-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@ PortGroup compilers 1.0
</span> PortGroup xcodeversion 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-tensorflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name py-tensorflow1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.14.0
</span> revision 0
github.setup tensorflow tensorflow ${version} v
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +24,11 @@ long_description ${description}
</span>
homepage https://www.tensorflow.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.livecheck.regex {([0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex {(1\.[0-9.]+)}
</span>
<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 c89d7a99933fb2cac9e9d8e694c6def88c2dfa9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fab2eb90de8dc1fc6e8e95cbc66c3aa7b92c28e3df4191017cb2901c8d3f023a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41341410
</span>
compiler.blacklist-append {clang < 840}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,12 +62,13 @@ python.versions 27 35 36 37
</span> python.default_version 37
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-tensorflow
</span>
depends_build-append \
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:bazel25 \
</span> port:cctools
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,8 +81,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-numpy \
port:py${python.version}-protobuf3 \
port:py${python.version}-six \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorboard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tensorflow_estimator \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tensorboard1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-tensorflow_estimator1 \
</span> port:py${python.version}-termcolor \
port:py${python.version}-wheel \
port:py${python.version}-wrapt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,8 +104,8 @@ if {${name} ne ${subport}} {
</span> if {![variant_isset native]} {
configure.env-append CC_OPT_FLAGS=${base_march}
build.env-append CC_OPT_FLAGS=${base_march}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "This version is built based on a base architecture for convenience,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- which may not be optimized for your system. To build a version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "This version is built based on a base architecture for convenience,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which may not be optimized for your system. To build a version
</span> customized for your machine, use the +native variant"
}
# Disable Xcode detection on older OSes, as we want the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow1/files/CLOCK_REALTIME-Older-OSX.patch b/python/py-tensorflow1/files/CLOCK_REALTIME-Older-OSX.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b897dfc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow1/files/CLOCK_REALTIME-Older-OSX.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tensorflow/core/platform/posix/env_time.cc b/tensorflow/core/platform/posix/env_time.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 59a67b17aa..568f7158e0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tensorflow/core/platform/posix/env_time.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tensorflow/core/platform/posix/env_time.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +18,9 @@ limitations under the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tensorflow/core/platform/env_time.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/clock.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace tensorflow {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +31,14 @@ class PosixEnvTime : public EnvTime {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint64 NowNanos() override {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timespec ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- clock_gettime(CLOCK_REALTIME, &ts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //clock_gettime(CLOCK_REALTIME, &ts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clock_serv_t cclock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_timespec_t mts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clock_get_time(cclock, &mts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_deallocate(mach_task_self(), cclock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ts.tv_sec = mts.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ts.tv_nsec = mts.tv_nsec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (static_cast<uint64>(ts.tv_sec) * kSecondsToNanos +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static_cast<uint64>(ts.tv_nsec));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>