Resolved one issue with variables reuse

hkaggarwal · Aug 30, 2018 · 44a046a · 44a046a
1 parent 2338d76
commit 44a046a
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 29 deletions.
diff --git a/model.py b/model.py
@@ -179,18 +179,17 @@ def makeModel(atb,csm,mask,training,nLayers,K,gradientMethod):
     out={}
     out['dc0']=atb
     with tf.name_scope('myModel'):
-        for i in range(1,K+1):
-            j=str(i)
-            with tf.variable_scope('Wts'):
+        with tf.variable_scope('Wts',reuse=tf.AUTO_REUSE):
+            for i in range(1,K+1):
+                j=str(i)
                 out['dw'+j]=dw(out['dc'+str(i-1)],training,nLayers)
-
-            lam1=getLambda()
-            rhs=atb + lam1*out['dw'+j]
-            if gradientMethod=='AG':
-                out['dc'+j]=dc(rhs,csm,mask,lam1)
-            elif gradientMethod=='MG':
-                if training:
-                    out['dc'+j]=dcManualGradient(rhs)
-                else:
+                lam1=getLambda()
+                rhs=atb + lam1*out['dw'+j]
+                if gradientMethod=='AG':
                     out['dc'+j]=dc(rhs,csm,mask,lam1)
+                elif gradientMethod=='MG':
+                    if training:
+                        out['dc'+j]=dcManualGradient(rhs)
+                    else:
+                        out['dc'+j]=dc(rhs,csm,mask,lam1)
     return out
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/checkpoint b/savedModels/09Aug_0333pm_5L_1K_100E_MG/checkpoint
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/checkpointTst b/savedModels/09Aug_0333pm_5L_1K_100E_MG/checkpointTst
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/events.out.tfevents.1533846944.r-cbig006 b/savedModels/09Aug_0333pm_5L_1K_100E_MG/events.out.tfevents.1533846944.r-cbig006
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/model-100.data-00000-of-00001 b/savedModels/09Aug_0333pm_5L_1K_100E_MG/model-100.data-00000-of-00001
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/model-100.index b/savedModels/09Aug_0333pm_5L_1K_100E_MG/model-100.index
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/model-100.meta b/savedModels/09Aug_0333pm_5L_1K_100E_MG/model-100.meta
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/model.data-00000-of-00001 b/savedModels/09Aug_0333pm_5L_1K_100E_MG/model.data-00000-of-00001
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/model.index b/savedModels/09Aug_0333pm_5L_1K_100E_MG/model.index
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/model.meta b/savedModels/09Aug_0333pm_5L_1K_100E_MG/model.meta
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/modelTst.data-00000-of-00001 b/savedModels/09Aug_0333pm_5L_1K_100E_MG/modelTst.data-00000-of-00001
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/modelTst.index b/savedModels/09Aug_0333pm_5L_1K_100E_MG/modelTst.index
diff --git a/savedModels/09Aug_0333pm_5L_1K_100E_MG/modelTst.meta b/savedModels/09Aug_0333pm_5L_1K_100E_MG/modelTst.meta
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/checkpoint b/savedModels/09Aug_0335pm_5L_1K_100E_AG/checkpoint
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/checkpointTst b/savedModels/09Aug_0335pm_5L_1K_100E_AG/checkpointTst
diff --git a/.../09Aug_0335pm_5L_1K_100E_AG/events.out.tfevents.1533846996.argon-mm-p100-compute-9-32.hpc b/.../09Aug_0335pm_5L_1K_100E_AG/events.out.tfevents.1533846996.argon-mm-p100-compute-9-32.hpc
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/model-100.data-00000-of-00001 b/savedModels/09Aug_0335pm_5L_1K_100E_AG/model-100.data-00000-of-00001
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/model-100.index b/savedModels/09Aug_0335pm_5L_1K_100E_AG/model-100.index
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/model-100.meta b/savedModels/09Aug_0335pm_5L_1K_100E_AG/model-100.meta
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/model.data-00000-of-00001 b/savedModels/09Aug_0335pm_5L_1K_100E_AG/model.data-00000-of-00001
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/model.index b/savedModels/09Aug_0335pm_5L_1K_100E_AG/model.index
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/model.meta b/savedModels/09Aug_0335pm_5L_1K_100E_AG/model.meta
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/modelTst.data-00000-of-00001 b/savedModels/09Aug_0335pm_5L_1K_100E_AG/modelTst.data-00000-of-00001
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/modelTst.index b/savedModels/09Aug_0335pm_5L_1K_100E_AG/modelTst.index
diff --git a/savedModels/09Aug_0335pm_5L_1K_100E_AG/modelTst.meta b/savedModels/09Aug_0335pm_5L_1K_100E_AG/modelTst.meta
diff --git a/trn.py b/trn.py
@@ -63,11 +63,11 @@
 
 #--------------------------------------------------------------
 #% SET THESE PARAMETERS CAREFULLY
-nLayers=5
-epochs=100
+nLayers=3
+epochs=5
 batchSize=4
 gradientMethod='AG'
-K=1
+K=2
 sigma=0.01
 
 #--------------------------------------------------------------------------
@@ -136,10 +136,11 @@
 tf.summary.scalar('loss', loss)
 update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
 
-optimizer = tf.train.AdamOptimizer()
-gvs = optimizer.compute_gradients(loss)
-capped_gvs = [(tf.clip_by_value(grad, -1., 1.), var) for grad, var in gvs]
-opToRun=optimizer.apply_gradients(capped_gvs)
+with tf.name_scope('optimizer'):
+    optimizer = tf.train.AdamOptimizer()
+    gvs = optimizer.compute_gradients(loss)
+    capped_gvs = [(tf.clip_by_value(grad, -1., 1.), var) for grad, var in gvs]
+    opToRun=optimizer.apply_gradients(capped_gvs)
 
 
 #%% training code