Add log_device_placement #713

Author: Oceania2018

src/TensorFlowNET.Core/Contrib/Learn/Preprocessing/VocabularyProcessor.cs renamed to src/TensorFlowNET.Core/APIs/tf.config.cs

@@ -14,18 +14,19 @@ You may obtain a copy of the License at
    limitations under the License.
 ******************************************************************************/
 
-namespace Tensorflow.Contrib.Learn.Preprocessing
+using Tensorflow.Contexts;
+using Tensorflow.Framework;
+
+namespace Tensorflow
 {
-    public class VocabularyProcessor
+    public partial class tensorflow
     {
-        private int _max_document_length;
-        private int _min_frequency;
-
-        public VocabularyProcessor(int max_document_length,
-            int min_frequency)
-        {
-            _max_document_length = max_document_length;
-            _min_frequency = min_frequency;
-        }
+        /// <summary>
+        /// Public API for tf.debugging namespace
+        /// https://www.tensorflow.org/api_docs/python/tf/debugging
+        /// More debugging instructions
+        /// https://developer.ibm.com/technologies/artificial-intelligence/tutorials/debug-tensorflow/
+        /// </summary>
+        public ConfigImpl config => new ConfigImpl();
     }
 }

src/TensorFlowNET.Core/APIs/tf.debugging.cs

@@ -14,41 +14,18 @@ You may obtain a copy of the License at
    limitations under the License.
 ******************************************************************************/
 
+using Tensorflow.Debugging;
+
 namespace Tensorflow
 {
     public partial class tensorflow
     {
         /// <summary>
-        /// Assert the condition `x == y` holds element-wise.
+        /// Public API for tf.debugging namespace
+        /// https://www.tensorflow.org/api_docs/python/tf/debugging
+        /// More debugging instructions
+        /// https://developer.ibm.com/technologies/artificial-intelligence/tutorials/debug-tensorflow/
         /// </summary>
-        /// <typeparam name="T1"></typeparam>
-        /// <typeparam name="T2"></typeparam>
-        /// <param name="t1"></param>
-        /// <param name="t2"></param>
-        /// <param name="data"></param>
-        /// <param name="message"></param>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public Tensor assert_equal<T1, T2>(T1 t1,
-            T2 t2,
-            object[] data = null,
-            string message = null,
-            string name = null)
-            => check_ops.assert_equal(t1,
-                t2,
-                data: data,
-                message: message,
-                name: name);
-
-        public Tensor assert_greater_equal<T1, T2>(Tensor x,
-            Tensor y,
-            object[] data = null,
-            string message = null,
-            string name = null)
-            => check_ops.assert_greater_equal(x,
-                y,
-                data: data,
-                message: message,
-                name: name);
+        public DebugImpl debugging => new DebugImpl();
     }
 }

src/TensorFlowNET.Core/Contexts/Context.AutoMode.cs

@@ -0,0 +1,85 @@
+/*****************************************************************************
+   Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+******************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Tensorflow.Eager;
+using static Tensorflow.Binding;
+using Google.Protobuf;
+
+namespace Tensorflow.Contexts
+{
+    /// <summary>
+    /// Environment in which eager operations execute.
+    /// </summary>
+    public sealed partial class Context
+    {
+        // [DebuggerStepThrough]
+        public T RunInAutoMode<T>(Func<T> graphAction, Func<T> eagerAction, params Tensor[] tensors)
+        {
+            var shouldRunInEager = executing_eagerly()
+                && tensors.Count(x => x.IsEagerTensor) == tensors.Length;
+
+            if (shouldRunInEager)
+                return eagerAction();
+            else
+            {
+                if (executing_eagerly())
+                {
+                    graph_mode();
+                    var result = graphAction();
+                    restore_mode();
+                    return result;
+                }
+                else
+                {
+                    return graphAction();
+                }
+            }
+        }
+
+        // [DebuggerStepThrough]
+        public Tensors RunInAutoMode2(Func<Tensors> graphAction,
+            Func<Tensors> eagerAction,
+            Action<Operation> recordGradient,
+            Tensors tensors)
+        {
+            var shouldRunInEager = executing_eagerly()
+                && tensors.Count(x => x.IsEagerTensor) == tensors.Length;
+
+            if (shouldRunInEager)
+                return eagerAction();
+            else
+            {
+                if (executing_eagerly())
+                {
+                    graph_mode();
+                    var result = graphAction();
+                    restore_mode();
+                    return result;
+                }
+                else
+                {
+                    var result = graphAction();
+                    if (tf.Runner.MustRecordGradient())
+                        recordGradient(result[0].op);
+                    return result;
+                }
+            }
+        }
+    }
+}

src/TensorFlowNET.Core/Contexts/Context.Config.cs

@@ -0,0 +1,48 @@
+/*****************************************************************************
+   Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+******************************************************************************/
+
+using System;
+using System.Diagnostics;
+
+namespace Tensorflow.Contexts
+{
+    /// <summary>
+    /// Environment in which eager operations execute.
+    /// </summary>
+    public sealed partial class Context
+    {
+        ConfigProto _config;
+
+        ConfigProto config()
+        {
+            var config = new ConfigProto()
+            {
+                LogDevicePlacement = _log_device_placement,
+                GpuOptions = _compute_gpu_options()
+            };
+
+            return config;
+        }
+
+        GPUOptions _compute_gpu_options()
+        {
+            return new GPUOptions()
+            {
+
+            };
+        }
+    }
+}

src/TensorFlowNET.Core/Contexts/Context.Device.cs

@@ -0,0 +1,42 @@
+/*****************************************************************************
+   Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+******************************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Tensorflow.Eager;
+using static Tensorflow.Binding;
+using Google.Protobuf;
+
+namespace Tensorflow.Contexts
+{
+    /// <summary>
+    /// Environment in which eager operations execute.
+    /// </summary>
+    public sealed partial class Context
+    {
+        ContextDevicePlacementPolicy _device_policy;
+        bool _log_device_placement;
+
+        public void log_device_placement(bool enable)
+        {
+            if (_handle != null)
+                c_api.TFE_ContextSetLogDevicePlacement(_handle, enable, tf.Status.Handle);
+            _log_device_placement = enable;
+            // _thread_local_data.function_call_options = null;
+        }
+    }
+}

src/TensorFlowNET.Core/Contexts/Context.cs

@@ -19,13 +19,14 @@ limitations under the License.
 using System.Linq;
 using Tensorflow.Eager;
 using static Tensorflow.Binding;
+using Google.Protobuf;
 
 namespace Tensorflow.Contexts
 {
     /// <summary>
     /// Environment in which eager operations execute.
     /// </summary>
-    public sealed class Context : IDisposable
+    public sealed partial class Context : IDisposable
     {
         public const int GRAPH_MODE = 0;
         public const int EAGER_MODE = 1;
@@ -37,14 +38,14 @@ public sealed class Context : IDisposable
         ContextSwitchStack context_switches;
         public FunctionCallOptions FunctionCallOptions { get; }
 
-        public SafeContextHandle Handle { get; }
+        SafeContextHandle _handle;
+        public SafeContextHandle Handle => _handle;
 
-        public Context(ContextOptions opts, Status status)
+        public Context()
         {
-            Handle = c_api.TFE_NewContext(opts.Handle, status.Handle);
-            status.Check(true);
+            _device_policy = ContextDevicePlacementPolicy.DEVICE_PLACEMENT_SILENT;
             context_switches = new ContextSwitchStack(defaultExecutionMode == EAGER_MODE, false);
-            initialized = true;
+            initialized = false;
             FunctionCallOptions = new FunctionCallOptions();
         }
 
@@ -55,14 +56,25 @@ public void ensure_initialized()
         {
             if (initialized)
                 return;
+
+            _config = config();
+            var config_str = _config.ToByteArray();
+
+            using var opts = new ContextOptions();
+            using var status = new Status();
+            c_api.TFE_ContextOptionsSetConfig(opts.Handle, config_str, (ulong)config_str.Length, status.Handle);
+            status.Check(true);
+            c_api.TFE_ContextOptionsSetDevicePlacementPolicy(opts.Handle, _device_policy);
+            _handle = c_api.TFE_NewContext(opts.Handle, status.Handle);
+            status.Check(true);
             initialized = true;
         }
 
         public void start_step()
-            => c_api.TFE_ContextStartStep(Handle);
+            => c_api.TFE_ContextStartStep(_handle);
 
         public void end_step()
-            => c_api.TFE_ContextEndStep(Handle);
+            => c_api.TFE_ContextEndStep(_handle);
 
         /// <summary>
         /// Checks whether the current thread has eager execution enabled.
@@ -91,61 +103,7 @@ public void restore_mode()
             context_switches.Pop();
         }
 
-        // [DebuggerStepThrough]
-        public T RunInAutoMode<T>(Func<T> graphAction, Func<T> eagerAction, params Tensor[] tensors)
-        {
-            var shouldRunInEager = executing_eagerly()
-                && tensors.Count(x => x.IsEagerTensor) == tensors.Length;
-
-            if (shouldRunInEager)
-                return eagerAction();
-            else
-            {
-                if (executing_eagerly())
-                {
-                    graph_mode();
-                    var result = graphAction();
-                    restore_mode();
-                    return result;
-                }
-                else
-                {
-                    return graphAction();
-                }
-            }
-        }
-
-        // [DebuggerStepThrough]
-        public Tensors RunInAutoMode2(Func<Tensors> graphAction, 
-            Func<Tensors> eagerAction, 
-            Action<Operation> recordGradient,
-            Tensors tensors)
-        {
-            var shouldRunInEager = executing_eagerly()
-                && tensors.Count(x => x.IsEagerTensor) == tensors.Length;
-
-            if (shouldRunInEager)
-                return eagerAction();
-            else
-            {
-                if (executing_eagerly())
-                {
-                    graph_mode();
-                    var result = graphAction();
-                    restore_mode();
-                    return result;
-                }
-                else
-                {
-                    var result = graphAction();
-                    if (tf.Runner.MustRecordGradient())
-                        recordGradient(result[0].op);
-                    return result;
-                }
-            }
-        }
-
         public void Dispose()
-            => Handle.Dispose();
+            => _handle.Dispose();
     }
 }