From c0fd13503d9686264b3d4b488ede9bd14d81f739 Mon Sep 17 00:00:00 2001
From: Oceania2018 <haiping008@gmail.com>
Date: Thu, 30 May 2019 07:33:44 -0500
Subject: [PATCH] word_cnn save training step works.

---
 graph/word_cnn.meta                           | Bin 87561 -> 87561 bytes
 src/TensorFlowNET.Core/Train/Saving/Saver.cs  |  25 +++++++--------
 .../TextProcess/CnnTextClassification.cs      |  29 ++++++------------
 3 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/graph/word_cnn.meta b/graph/word_cnn.meta
index de19687b222527b918083507064ca1037af50972..141947b19b16be2167b8162ff6a80360d97b7491 100644
GIT binary patch
delta 3070
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
E0j;jCjQ{`u

delta 2900
zcmcImX-rgC6z04)Gt4|>1|BfL0JDIA4vVNnmJvoNB_vj56zvZcktK=|L{Ss8sTj8!
zqP3jZTWt!~l@<!<4Lp}>AgzT|O$Ce^S6UNmHMYcPNsC?H46~RS6qBaE-aYqx_nhyY
zbMJTWu4d`3W@%e?7(VUO(xR|5Mye!ouNq?Ufp~f;A{*E}Es-=pmkGY&fM?}3!0iMs
z1pW0PxItfPb>m&V$@UF5#NfSadbtCMD-A2G4)Xa#2u8nw5Mqh~9Y#gIW1H<VKr|(h
zaX`8ap!G8<IeC6rMM+t4X%){Tv2-wME(CgWkS|(b<Ty!wNm;qogKN%Bq1&VXl49rm
z2!ErBQxvbRShuXKqI50K@Lsenu9%6ER;^f8S<1`OB|IZ9@c?lhz!AuS0DRA+pz{)E
zaoCa?5$K7#4aAZs!jf~;bSQN;qZ=bIEjI1u5OPK%rp>7ydwoYP<Bfbv07h5q>EpTG
z<BWlvJ*Q8)LTo`ZBmR-nlWC9mM}D~wNCy{Ba!cchrkP920nZnzQM*Y-y9-&ymUCNA
zB>ktTUE(D0^YV0X8u?}M-f~AraC7A;EXoSO{j2?H*_vMPb9fxR!X;S|qE|&XR5i(L
zxe_<ZFk|CYXWoQOAFz(-`0)J&jxnv=yi?&cjJtNbj7N1aLRBmeYWG!JQBvC$p{@JU
zm3U;6KNcR-v6_hmXgQ|F#fN#CeI$luCKq5=M+mCE@Wu1TeOOK0h&|94fJ>V+*m_)r
zlfIH+jlko<CUH|Y2I94*Q2V?Fe>f0}GY%;*w>gg9Z8R`qJhCPQqOHO3?=KT*K~s~B
zn4OHFrG{lvL=G)UsBDwr%*GHLJQ0SSr=-;XWdBQ0G_=Ii3GF2;lU9Hqok?R-t<0ua
zkta{zcLU;tb`9#g47j63jn(bJ;#i6G?JC;*^*sjC>O{s#-;Be`PNg*~qe*qm1k{}l
zv%!Dsl3`^RPiJ&8u12r_Ru8Or_~|DX7{I<Lt;*WQ`D=@<wN-Gd#Xa4VjKkk?wzeED
z*V1X-W@pb?XU{F0b@WKj+bj-W48mV7@_6W~h8i!emxTK`wlS0L<-U9A*()i`>k-QS
zT5zdT0;vxH9es2)%_dQ3x|xDYuC2;)Xpd3MR<f>IQ~;}Zs2!<&(|ve}Q=r^gcyZP<
zbYeCHlXD7CVBGb0N71kT>kFOwg_au&JV*`QnCT#OH1od^LhY?Bqfi*Uwa7_<R^7hH
zyg~_A-Fr*&3fG<cI~n5`TE<-fE?Cso4O2?6?U{x)KA7qzES|zj|9luPv1+N>v${V4
z7l!aSh}7hP%vNGjF9kWS{MDD%J&AqQvWLJ$h|2;`KHWC9u3r{ASZ)CgHat)e6$^6O
z_sl#t>!cx*#H!jsqp~J7^FWOiPlD<9!^t+B=e5%w51+jmy)E-0u!Dt#%=oeD-!B%7
z<jEjN_)rRu*_b!G350_R;3RJfzTyk3-0I_bT?mW(V7A-ed7`*(vG}bEAQbb46v7i8
zj*qDOwjP7fqlR3TL~6jM3POqol7OT~gEq$f;y3c#xcrLs<yEE2%S$WP*&YMjcCuFs
zk;3IL*dudpeX=zYb~uhlDCx`qwe^YdyK5@k1c78g2ORI7g}Z5us3QZBAQ29Z2Q51i
zHWpf4%N-GQq-z4)am~LbYy+tb62o>zfQ0xO!6g->)(D@D<PaY|WKJAxby<JJ!2y?b
zHXdp{llcf+5@0$*3{%DDh~>F>mBh#;yIC%VSP~&bP$j_(7;*OX8c1(4gbNLmp};<u
zl{%i`_LDh@pb_$>!Yuo=<$07KLN_{5;aHii06VaL+DpK2VrIZw(51pkJGyAGK{%HN
zOYP>&LOq#lf_X$|7LT_w2~;H23>tF91U%V0T^tQ(LL3oE@nj$q!brn3@FPBENF;mA
z5KGQX7rnKa5b&`cd`PniIDD~#!?V4qWKIUW_#eU!nW39xWQn<dG=Y(%nIZH)uoX(O
H;Ap_V6W(*z

diff --git a/src/TensorFlowNET.Core/Train/Saving/Saver.cs b/src/TensorFlowNET.Core/Train/Saving/Saver.cs
index a6ced8fa..0f3a2ab8 100644
--- a/src/TensorFlowNET.Core/Train/Saving/Saver.cs
+++ b/src/TensorFlowNET.Core/Train/Saving/Saver.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using static Tensorflow.Python;
 
 namespace Tensorflow
 {
@@ -144,26 +145,20 @@ namespace Tensorflow
 
         public string save(Session sess,
             string save_path,
-            string global_step = "",
+            int global_step = -1,
             string latest_filename = "",
             string meta_graph_suffix = "meta",
             bool write_meta_graph = true,
             bool write_state = true,
-            bool strip_default_attrs = false)
+            bool strip_default_attrs = false,
+            bool save_debug_info = false)
         {
             if (string.IsNullOrEmpty(latest_filename))
                 latest_filename = "checkpoint";
             string model_checkpoint_path = "";
             string checkpoint_file = "";
 
-            if (!string.IsNullOrEmpty(global_step))
-            {
-
-            }
-            else
-            {
-                checkpoint_file = save_path;
-            }
+            checkpoint_file = $"{save_path}-{global_step}";
 
             var save_path_parent = Path.GetDirectoryName(save_path);
 
@@ -189,6 +184,7 @@ namespace Tensorflow
             if (write_meta_graph)
             {
                 string meta_graph_filename = checkpoint_management.meta_graph_filename(checkpoint_file, meta_graph_suffix: meta_graph_suffix);
+                export_meta_graph(meta_graph_filename, strip_default_attrs: strip_default_attrs, save_debug_info: save_debug_info);
             }
 
             return _is_empty ? string.Empty : model_checkpoint_path;
@@ -244,10 +240,11 @@ namespace Tensorflow
         public MetaGraphDef export_meta_graph(string filename= "",
                         string[] collection_list = null,
                         string export_scope = "",
-                        bool as_text= false,
-                        bool clear_devices= false,
-                        bool clear_extraneous_savers= false,
-                        bool strip_default_attrs= false)
+                        bool as_text = false,
+                        bool clear_devices = false,
+                        bool clear_extraneous_savers = false,
+                        bool strip_default_attrs = false,
+                        bool save_debug_info = false)
         {
             return export_meta_graph(
                 filename: filename,
diff --git a/test/TensorFlowNET.Examples/TextProcess/CnnTextClassification.cs b/test/TensorFlowNET.Examples/TextProcess/CnnTextClassification.cs
index 01b6d72c..aaac8e4a 100644
--- a/test/TensorFlowNET.Examples/TextProcess/CnnTextClassification.cs
+++ b/test/TensorFlowNET.Examples/TextProcess/CnnTextClassification.cs
@@ -26,14 +26,13 @@ namespace TensorFlowNET.Examples
         public string Name => "CNN Text Classification";
         public int? DataLimit = null;
         public bool ImportGraph { get; set; } = true;
-        public bool UseSubset = false; // <----- set this true to use a limited subset of dbpedia
 
-        private string dataDir = "text_classification";
+        private string dataDir = "word_cnn";
         private string dataFileName = "dbpedia_csv.tar.gz";
 
         private const string TRAIN_PATH = "text_classification/dbpedia_csv/train.csv";
         private const string TEST_PATH = "text_classification/dbpedia_csv/test.csv";
-
+        
         private const int NUM_CLASS = 14;
         private const int BATCH_SIZE = 64;
         private const int NUM_EPOCHS = 10;
@@ -41,6 +40,7 @@ namespace TensorFlowNET.Examples
         private const int CHAR_MAX_LEN = 1014;
         
         protected float loss_value = 0;
+        int vocabulary_size = 50000;
 
         public bool Run()
         {
@@ -63,10 +63,9 @@ namespace TensorFlowNET.Examples
             int[][] x = null;
             int[] y = null;
             int alphabet_size = 0;
-            int vocabulary_size = 0;
 
             var word_dict = DataHelpers.build_word_dict(TRAIN_PATH);
-            vocabulary_size = len(word_dict);
+            // vocabulary_size = len(word_dict);
             (x, y) = DataHelpers.build_word_dataset(TRAIN_PATH, word_dict, WORD_MAX_LEN);
 
             Console.WriteLine("\tDONE ");
@@ -142,7 +141,7 @@ namespace TensorFlowNET.Examples
                     if (valid_accuracy > max_accuracy)
                     {
                         max_accuracy = valid_accuracy;
-                        saver.save(sess, $"{dataDir}/word_cnn.ckpt", global_step: step.ToString());
+                        saver.save(sess, $"{dataDir}/word_cnn.ckpt", global_step: step);
                         print("Model is saved.\n");
                     }
                 }
@@ -218,18 +217,10 @@ namespace TensorFlowNET.Examples
 
         public void PrepareData()
         {
-            if (UseSubset)
-            {
-                var url = "https://raw.githubusercontent.com/SciSharp/TensorFlow.NET/master/data/dbpedia_subset.zip";
-                Web.Download(url, dataDir, "dbpedia_subset.zip");
-                Compress.UnZip(Path.Combine(dataDir, "dbpedia_subset.zip"), Path.Combine(dataDir, "dbpedia_csv"));
-            }
-            else
-            {
-                string url = "https://github.com/le-scientifique/torchDatasets/raw/master/dbpedia_csv.tar.gz";
-                Web.Download(url, dataDir, dataFileName);
-                Compress.ExtractTGZ(Path.Join(dataDir, dataFileName), dataDir);
-            }
+            // full dataset https://github.com/le-scientifique/torchDatasets/raw/master/dbpedia_csv.tar.gz
+            var url = "https://raw.githubusercontent.com/SciSharp/TensorFlow.NET/master/data/dbpedia_subset.zip";
+            Web.Download(url, dataDir, "dbpedia_subset.zip");
+            Compress.UnZip(Path.Combine(dataDir, "dbpedia_subset.zip"), Path.Combine(dataDir, "dbpedia_csv"));
 
             if (ImportGraph)
             {
@@ -242,7 +233,7 @@ namespace TensorFlowNET.Examples
                     Console.WriteLine("Discarding cached file: " + meta_path);
                     File.Delete(meta_path);
                 }
-                var url = "https://raw.githubusercontent.com/SciSharp/TensorFlow.NET/master/graph/" + meta_file;
+                url = "https://raw.githubusercontent.com/SciSharp/TensorFlow.NET/master/graph/" + meta_file;
                 Web.Download(url, "graph", meta_file);
             }
         }