minor changes

Author: art-programmer

code/kaffe/__init__.pyc

@@ -2,11 +2,11 @@ nvcc = /usr/local/cuda-8.0/bin/nvcc
 cudalib = /usr/local/cuda-8.0/lib64/
 tensorflow = /usr/local/lib/python2.7/dist-packages/tensorflow/include
 
-all: depthestimate/tf_nndistance_so.so depthestimate/render_balls_so.so
+all: tf_nndistance_so.so
 .PHONY : all
 
-depthestimate/tf_nndistance_so.so: depthestimate/tf_nndistance_g.cu.o depthestimate/tf_nndistance.cpp
-	g++ -std=c++11 depthestimate/tf_nndistance.cpp depthestimate/tf_nndistance_g.cu.o -o depthestimate/tf_nndistance_so.so -shared -fPIC -I $(tensorflow) -lcudart -L $(cudalib) -O2 -D_GLIBCXX_USE_CXX11_ABI=0
+tf_nndistance_so.so: tf_nndistance_g.cu.o tf_nndistance.cpp
+	g++ -std=c++11 tf_nndistance.cpp tf_nndistance_g.cu.o -o tf_nndistance_so.so -shared -fPIC -I $(tensorflow) -lcudart -L $(cudalib) -O2 -D_GLIBCXX_USE_CXX11_ABI=0
 
-depthestimate/tf_nndistance_g.cu.o: depthestimate/tf_nndistance_g.cu
-	$(nvcc) -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11 -c -o depthestimate/tf_nndistance_g.cu.o depthestimate/tf_nndistance_g.cu -I $(tensorflow) -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC -O2
+tf_nndistance_g.cu.o: tf_nndistance_g.cu
+	$(nvcc) -D_GLIBCXX_USE_CXX11_ABI=0 -std=c++11 -c -o tf_nndistance_g.cu.o tf_nndistance_g.cu -I $(tensorflow) -DGOOGLE_CUDA=1 -x cu -Xcompiler -fPIC -O2

code/kaffe/caffe/__init__.pyc

@@ -393,7 +393,7 @@ def main(options):
         sess.run(init_op)
         if options.restore == 0:
             #fine-tune from DeepLab model
-            var_to_restore = [v for v in var_to_restore if 'res5d' not in v.name and 'segmentation' not in v.name and 'plane' not in v.name and 'deep_supervision' not in v.name and 'local' not in v.name and 'boundary' not in v.name and 'degridding' not in v.name]
+            var_to_restore = [v for v in var_to_restore if 'res5d' not in v.name and 'segmentation' not in v.name and 'plane' not in v.name and 'deep_supervision' not in v.name and 'local' not in v.name and 'boundary' not in v.name and 'degridding' not in v.name and 'res2a_branch2a' not in v.name and 'res2a_branch1' not in v.name]
             pretrained_model_loader = tf.train.Saver(var_to_restore)
             pretrained_model_loader.restore(sess,"../pretrained_models/deeplab_resnet.ckpt")
         elif options.restore == 1:

code/kaffe/caffe/resolver.pyc

@@ -1480,8 +1480,8 @@ def parse_args():
 
 if __name__=='__main__':
     args = parse_args()
-
     print "keyname=%s task=%s started"%(args.keyname, args.task)
+    
     try:
         if args.task == "train":
             main(args)