Moving runtime bindings into their own crate

Currently the runtime bindings live inside of
tensorflow-sys, which includes several packages for
building tensorflow. These packages aren't needed
for the runtime bindings at all, and this seems like
the logical way to separate the two.

Author: brianjjones

Cargo.toml

@@ -23,7 +23,8 @@ features = ["private-docs-rs", "tensorflow_unstable", "ndarray", "eager"]
 libc = "0.2.132"
 num-complex = { version = "0.4.2", default-features = false }
 tensorflow-internal-macros = { version = "=0.0.3", path = "tensorflow-internal-macros" }
-tensorflow-sys = { version = "0.22.1", path = "tensorflow-sys" }
+tensorflow-sys = { version = "0.22.1", path = "tensorflow-sys", optional = true }
+tensorflow-sys-runtime = { path = "tensorflow-sys-runtime", optional = true }
 byteorder = "1.4.3"
 crc = "3.0.0"
 half = "2.1.0"
@@ -38,9 +39,10 @@ random = "0.12.2"
 serial_test = "0.9.0"
 
 [features]
+default = ["tensorflow-sys"]
 tensorflow_gpu = ["tensorflow-sys/tensorflow_gpu"]
 tensorflow_unstable = []
-tensorflow_runtime_linking = ["tensorflow-sys/runtime_linking"]
+tensorflow_runtime_linking = ["tensorflow-sys-runtime"]
 eager = ["tensorflow-sys/eager"]
 # This is for testing purposes; users should not use this.
 examples_system_alloc = ["tensorflow-sys/examples_system_alloc"]
@@ -69,4 +71,4 @@ name = "xor"
 
 [[example]]
 name = "mobilenetv3"
-required-features = ["eager"]
+required-features = ["eager"]

src/buffer.rs

@@ -16,7 +16,10 @@ use std::ops::RangeTo;
 use std::os::raw::c_void as std_c_void;
 use std::process;
 use std::slice;
+#[cfg(feature = "default")]
 use tensorflow_sys as tf;
+#[cfg(feature = "tensorflow_runtime_linking")]
+use tensorflow_sys_runtime as tf;
 
 /// Fixed-length heap-allocated vector.
 /// This is basically a `Box<[T]>`, except that that type can't actually be constructed.

src/graph.rs

@@ -28,7 +28,10 @@ use std::slice;
 use std::str::FromStr;
 use std::str::Utf8Error;
 use std::sync::Arc;
+#[cfg(feature = "default")]
 use tensorflow_sys as tf;
+#[cfg(feature = "tensorflow_runtime_linking")]
+use tensorflow_sys_runtime as tf;
 
 #[derive(Debug)]
 struct GraphImpl {

src/lib.rs

@@ -49,7 +49,10 @@ use std::process;
 use std::ptr;
 use std::slice;
 use std::str::Utf8Error;
+#[cfg(feature = "default")]
 use tensorflow_sys as tf;
+#[cfg(feature = "tensorflow_runtime_linking")]
+use tensorflow_sys_runtime as tf;
 
 ////////////////////////
 

src/while_loop.rs

@@ -9,7 +9,11 @@ use std::os::raw::c_int;
 use std::ptr;
 use std::result;
 use std::slice;
+#[cfg(feature = "default")]
 use tensorflow_sys as tf;
+#[cfg(feature = "tensorflow_runtime_linking")]
+use tensorflow_sys_runtime as tf;
+
 
 // This exists purely to ensure TF_AbortWhile gets called properly, even on panic.
 #[derive(Debug)]

tensorflow-sys-runtime/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "tensorflow-sys-runtime"
+version = "0.1.0"
+authors = ["Brian Jones <[email protected]>"]
+license = "Apache-2.0"
+keywords = ["TensorFlow", "runtime bindings"]
+description = "The package provides runtime bindings to TensorFlow."
+documentation = "https://tensorflow.github.io/rust"
+homepage = "https://github.com/tensorflow/rust"
+repository = "https://github.com/tensorflow/rust"
+edition = "2018"
+
+[dependencies]
+libc = "0.2.132"
+lazy_static = "1.4.0"
+libloading = "0.7.3"
+cfg-if = "1.0.0"
+log = "0.4.17"

tensorflow-sys/src/runtime_linking/c_api.rs renamed to tensorflow-sys-runtime/src/c_api.rs

@@ -1,3 +1,4 @@
+include!("runtime.rs");
 link! {
 /* automatically generated by rust-bindgen 0.59.2 */
 

tensorflow-sys/src/runtime_linking/finder.rs renamed to tensorflow-sys-runtime/src/finder.rs

@@ -0,0 +1,23 @@
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+include!("c_api.rs");
+include!("types.rs");
+include!("finder.rs");
+pub use crate::TF_AttrType::*;
+pub use crate::TF_Code::*;
+pub use crate::TF_DataType::*;
+
+pub mod library {
+    use std::path::PathBuf;
+
+    // Include the definition of `load` here. This allows hiding all of the "extra" linking-related
+    // functions in the same place, without polluting the top-level namespace (which should only
+    // contain foreign functions and types).
+    #[doc(inline)]
+    pub use super::load;
+
+    pub fn find() -> Option<PathBuf> {
+        super::find("tensorflow")
+    }
+}