<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/12ed8446a64b9437f43cfeaae252236b2f691da2">https://github.com/macports/macports-ports/commit/12ed8446a64b9437f43cfeaae252236b2f691da2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 12ed8446a64 py-tensorflow: Fix import issue due to missing symbols Closes: https://trac.macports.org/ticket/61279
</span>12ed8446a64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 12ed8446a64b9437f43cfeaae252236b2f691da2
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Mar 26 15:32:20 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow: Fix import issue due to missing symbols
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61279
</span>---
python/py-tensorflow/Portfile | 10 ++-
.../files/fix-missing-static-symbols.patch | 76 ++++++++++++++++++++++
2 files changed, 83 insertions(+), 3 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 0a40e148ac6..ef4f211966e 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;'>@@ -9,7 +9,7 @@ PortGroup xcode_workaround 1.0
</span>
name py-tensorflow
version 2.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> github.setup tensorflow tensorflow ${version} v
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,14 +46,17 @@ xcode_workaround.type avoid_xcode_compiler
</span> xcode_workaround.os_versions 18 19
xcode_workaround.fixed_xcode_version 11.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Support python versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Supported python versions
</span> python.versions 37 38 39
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/61279
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append fix-missing-static-symbols.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
PortGroup bazel 1.0
# See https://www.tensorflow.org/install/source#macos for tested bazel versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.version "3.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.version 3.1
</span>
# TF versions 1 and 2 cannot be installed at once
conflicts py${python.version}-tensorflow1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +71,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-absl \
port:py${python.version}-astor \
port:py${python.version}-astunparse \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-flatbuffers \
</span> port:py${python.version}-gast \
port:py${python.version}-google-pasta \
port:py${python.version}-grpcio \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/files/fix-missing-static-symbols.patch b/python/py-tensorflow/files/fix-missing-static-symbols.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7164c0b7f28
</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-tensorflow/files/fix-missing-static-symbols.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 01044957857..e7307d47c4d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,15 +64,22 @@ namespace tensorflow {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace data {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace experimental {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const char* const SnapshotDatasetV2Op::kCompression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const char* const SnapshotDatasetV2Op::kCompressionAuto;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const char* const SnapshotDatasetV2Op::kReaderFunc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const char* const SnapshotDatasetV2Op::kShardFunc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const char* const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SnapshotDatasetV2Op::kReaderFuncTarguments;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const char* const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SnapshotDatasetV2Op::kShardFuncTarguments;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* static */ constexpr const int SnapshotDatasetV2Op::kFileFormatVersion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kDatasetType = "Snapshot";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kOutputTypes = "output_types";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kOutputShapes = "output_shapes";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kCompression = "compression";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kReaderPrefix = "reader_prefix";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kWriterPrefix = "writer_prefix";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kCompressionAuto = "AUTO";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kReaderFunc = "reader_func";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kShardFunc = "shard_func";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kReaderFuncOtherArgs =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "reader_func_other_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kShardFuncOtherArgs =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "shard_func_other_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kReaderFuncTarguments =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Treader_func_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* static */ const char* const SnapshotDatasetV2Op::kShardFuncTarguments = "Tshard_func_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ==== Snapshot Implementation ====
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.h b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d7097f43190..9b0a4cb9460 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tensorflow/core/kernels/data/experimental/snapshot_dataset_op.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tensorflow/core/kernels/data/experimental/snapshot_dataset_op.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,22 +40,19 @@ namespace experimental {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class SnapshotDatasetV2Op : public UnaryDatasetOpKernel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kDatasetType = "Snapshot";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kOutputTypes = "output_types";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kOutputShapes = "output_shapes";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kCompression = "compression";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kReaderPrefix = "reader_prefix";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kWriterPrefix = "writer_prefix";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kCompressionAuto = "AUTO";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kReaderFunc = "reader_func";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kShardFunc = "shard_func";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kReaderFuncOtherArgs =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "reader_func_other_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kShardFuncOtherArgs =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "shard_func_other_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kReaderFuncTarguments =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Treader_func_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static constexpr const char* const kShardFuncTarguments = "Tshard_func_args";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kDatasetType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kOutputTypes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kOutputShapes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kCompression;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kReaderPrefix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kWriterPrefix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kCompressionAuto;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kReaderFunc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kShardFunc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kReaderFuncOtherArgs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kShardFuncOtherArgs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kReaderFuncTarguments;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static const char* const kShardFuncTarguments;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ explicit SnapshotDatasetV2Op(OpKernelConstruction* ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>