More or less completely rewritten tensorflow-cc port

ports/tensorflow-cc/CONTROL

@@ -1,6 +1,4 @@
 Source: tensorflow-cc
-Version: 1.14
-Port-Version: 5
+Version: 2.3.1
 Description: Library for computation using data flow graphs for scalable machine learning
-Build-Depends: c-ares
-Supports: !x86
+Supports: !(x86|arm|uwp)

ports/tensorflow-cc/README-linux

@@ -0,0 +1,13 @@
+Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts
+    (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl).
+
+Note: Besides TensorFlow itself, you'll also need to pass its dependencies to the linker:
+    * libm
+    * libdl
+    * libpthread
+for example, '-ltensorflow_cc -lm -ldl -lpthread'.
+
+Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow_cc.a to avoid linking conflicts.
+
+Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library:
+    '-Wl,--whole-archive -ltensorflow_cc -Wl,--no-whole-archive [rest of linker arguments]'

ports/tensorflow-cc/README-macos

@@ -0,0 +1,12 @@
+Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts
+    (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl).
+
+Note: Besides TensorFlow itself, you'll also need to pass its dependencies to the linker:
+    * CoreFoundation
+    * Security (only when linking against the whole library, see below)
+for example, '-ltensorflow_cc -framework CoreFoundation -framework Security'.
+
+Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow_cc.a to avoid linking conflicts.
+
+Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library:
+    '-Wl,-force_load,path/to/libtensorflow_cc.a [rest of linker arguments]'

ports/tensorflow-cc/README-windows

@@ -0,0 +1,5 @@
+Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts
+    (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl).
+
+Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to convince the linker to include the whole library, i.e., link using options
+    '/WHOLEARCHIVE:tensorflow_cc.lib /WHOLEARCHIVE:tensorflow_cc-part2.lib /WHOLEARCHIVE:tensorflow_cc-part3.lib ...'

ports/tensorflow-cc/change-macros-for-static-lib.patch

@@ -0,0 +1,266 @@
+diff --git a/tensorflow/core/platform/macros.h b/tensorflow/core/platform/macros.h
+--- a/tensorflow/core/platform/macros.h
++++ b/tensorflow/core/platform/macros.h
+@@ -57,16 +57,7 @@
+ #define TF_SCANF_ATTRIBUTE(string_index, first_to_check)
+ #endif
+
+-// Control visibility outside .so
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_EXPORT __declspec(dllexport)
+-#else
+-#define TF_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
++#define TF_EXPORT
+
+ #ifdef __has_builtin
+ #define TF_HAS_BUILTIN(x) __has_builtin(x)
+
+diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
+--- a/tensorflow/c/c_api.h
++++ b/tensorflow/c/c_api.h
+@@ -70,24 +70,7 @@
+ //   and the API just provides high level controls over the number of
+ //   devices of each type.
+
+-// Macro to control visibility of exported symbols in the shared library (.so,
+-// .dylib, .dll).
+-// This duplicates the TF_EXPORT macro definition in
+-// tensorflow/core/platform/macros.h in order to keep this .h file independent
+-// of any other includes.
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/c_api_experimental.h b/tensorflow/c/c_api_experimental.h
+--- a/tensorflow/c/c_api_experimental.h
++++ b/tensorflow/c/c_api_experimental.h
+@@ -28,24 +28,7 @@
+ // The API here is subject to changes in the future.
+ // --------------------------------------------------------------------------
+
+-// Macro to control visibility of exported symbols in the shared library (.so,
+-// .dylib, .dll).
+-// This duplicates the TF_EXPORT macro definition in
+-// tensorflow/core/platform/macros.h in order to keep this .h file independent
+-// of any other includes.$a
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/c_api_macros.h b/tensorflow/c/c_api_macros.h
+--- a/tensorflow/c/c_api_macros.h
++++ b/tensorflow/c/c_api_macros.h
+@@ -16,18 +16,6 @@
+ #ifndef TENSORFLOW_C_C_API_MACROS_H_
+ #define TENSORFLOW_C_C_API_MACROS_H_
+
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #endif  // TENSORFLOW_C_C_API_MACROS_H_
+
+diff --git a/tensorflow/c/kernels.h b/tensorflow/c/kernels.h
+--- a/tensorflow/c/kernels.h
++++ b/tensorflow/c/kernels.h
+@@ -21,24 +21,7 @@
+ #include "tensorflow/c/tf_datatype.h"
+ #include "tensorflow/c/tf_status.h"
+
+-// Macro to control visibility of exported symbols in the shared library (.so,
+-// .dylib, .dll).
+-// This duplicates the TF_EXPORT macro definition in
+-// tensorflow/core/platform/macros.h in order to keep this .h file independent
+-// of any other includes.
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/ops.h b/tensorflow/c/ops.h
+--- a/tensorflow/c/ops.h
++++ b/tensorflow/c/ops.h
+@@ -76,19 +76,7 @@
+ #include "tensorflow/c/tf_datatype.h"
+ #include "tensorflow/c/tf_status.h"
+
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/tf_datatype.h b/tensorflow/c/tf_datatype.h
+--- a/tensorflow/c/tf_datatype.h
++++ b/tensorflow/c/tf_datatype.h
+@@ -18,24 +18,7 @@
+
+ #include <stddef.h>
+
+-// Macro to control visibility of exported symbols in the shared library (.so,
+-// .dylib, .dll).
+-// This duplicates the TF_EXPORT macro definition in
+-// tensorflow/core/platform/macros.h in order to keep this .h file independent
+-// of any other includes.
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/tf_status.h b/tensorflow/c/tf_status.h
+--- a/tensorflow/c/tf_status.h
++++ b/tensorflow/c/tf_status.h
+@@ -16,19 +16,7 @@
+ #ifndef TENSORFLOW_C_TF_STATUS_H_
+ #define TENSORFLOW_C_TF_STATUS_H_
+
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/tf_tensor.h b/tensorflow/c/tf_tensor.h
+--- a/tensorflow/c/tf_tensor.h
++++ b/tensorflow/c/tf_tensor.h
+@@ -22,24 +22,7 @@
+ #include "tensorflow/c/tf_datatype.h"
+ #include "tensorflow/c/tf_status.h"
+
+-// Macro to control visibility of exported symbols in the shared library (.so,
+-// .dylib, .dll).
+-// This duplicates the TF_EXPORT macro definition in
+-// tensorflow/core/platform/macros.h in order to keep this .h file independent
+-// of any other includes.
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {
+
+diff --git a/tensorflow/c/eager/c_api.h b/tensorflow/c/eager/c_api.h
+--- a/tensorflow/c/eager/c_api.h
++++ b/tensorflow/c/eager/c_api.h
+@@ -22,24 +22,7 @@
+
+ #include "tensorflow/c/c_api.h"
+
+-// Macro to control visibility of exported symbols in the shared library (.so,
+-// .dylib, .dll).
+-// This duplicates the TF_EXPORT macro definition in
+-// tensorflow/core/platform/macros.h in order to keep this .h file independent
+-// of any other includes.$a
+-#ifdef SWIG
+ #define TF_CAPI_EXPORT
+-#else
+-#if defined(_WIN32)
+-#ifdef TF_COMPILE_LIBRARY
+-#define TF_CAPI_EXPORT __declspec(dllexport)
+-#else
+-#define TF_CAPI_EXPORT __declspec(dllimport)
+-#endif  // TF_COMPILE_LIBRARY
+-#else
+-#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+-#endif  // _WIN32
+-#endif  // SWIG
+
+ #ifdef __cplusplus
+ extern "C" {

ports/tensorflow-cc/convert_lib_params_linux.py

@@ -0,0 +1,29 @@
+import sys
+
+version = sys.argv[1]
+
+with open(f"libtensorflow_cc.a.{version}-2.params", "w") as f_out:
+    parts = []
+    with open(f"libtensorflow_framework.so.{version}-2.params", "r") as f_in:
+        skip_next = False
+        for line in f_in:
+            if skip_next:
+                skip_next = False
+                continue
+            if line.startswith("-o"):
+                skip_next = True
+            elif line.startswith("bazel-out"):
+                f_out.write(line)
+                parts.append(line)
+    parts = set(parts)
+    with open(f"libtensorflow_cc.so.{version}-2.params", "r") as f_in:
+        skip_next = False
+        for line in f_in:
+            if skip_next:
+                skip_next = False
+                continue
+            if line.startswith("-o"):
+                skip_next = True
+            elif line.startswith("bazel-out"):
+                if line not in parts:
+                    f_out.write(line)

ports/tensorflow-cc/convert_lib_params_windows.py

@@ -0,0 +1,27 @@
+import os
+import sys
+
+file_no = 1
+with open("tensorflow_cc.dll-2.params", "r") as f_in:
+    lib_name = None
+    acc_size = 0
+    f_out = open("tensorflow_cc.lib-2.params-part1", "w")
+    for line in f_in:
+        if line.startswith("/OUT:"):
+            lib_name = line
+            line = line.replace(".dll", ".lib")
+            f_out.write(line)
+        elif line.startswith("/WHOLEARCHIVE:"):
+            line = line[len("/WHOLEARCHIVE:"):]
+            size = os.stat(f"../../{line.strip()}").st_size
+            if acc_size + size > 0xFFFFFFFF:
+                # we need to split the library if it is >4GB, because it's not supported even on x64 Windows
+                f_out.close()
+                file_no += 1
+                f_out = open(f"tensorflow_cc.lib-2.params-part{file_no}", "w")
+                acc_size = 0
+                f_out.write(lib_name.replace(".dll", f"-part{file_no}.lib"))
+            acc_size += size
+            f_out.write(line)
+    f_out.close()
+