Merge branch 'multi-gpu' of https://github.com/jcjohnson/neural-style …

…into multi-gpu

examples/multigpu_scripts/starry_stanford.sh

@@ -0,0 +1,77 @@
+# To run this script you'll need to download the ultra-high res
+# scan of Starry Night from the Google Art Project, available here:
+# https://commons.wikimedia.org/wiki/File:Van_Gogh_-_Starry_Night_-_Google_Art_Project.jpg
+
+STYLE_IMAGE=starry_night_gigapixel.jpg
+CONTENT_IMAGE=examples/inputs/hoovertowernight.jpg
+
+STYLE_WEIGHT=5e2
+STYLE_SCALE=1.0
+
+th neural_style.lua \
+  -content_image $CONTENT_IMAGE \
+  -style_image $STYLE_IMAGE \
+  -style_scale $STYLE_SCALE \
+  -print_iter 1 \
+  -style_weight $STYLE_WEIGHT \
+  -image_size 256 \
+  -output_image out1.png \
+  -tv_weight 0 \
+  -backend cudnn -cudnn_autotune
+
+th neural_style.lua \
+  -content_image $CONTENT_IMAGE \
+  -style_image $STYLE_IMAGE \
+  -init image -init_image out1.png \
+  -style_scale $STYLE_SCALE \
+  -print_iter 1 \
+  -style_weight $STYLE_WEIGHT \
+  -image_size 512 \
+  -num_iterations 500 \
+  -output_image out2.png \
+  -tv_weight 0 \
+  -backend cudnn -cudnn_autotune
+
+th neural_style.lua \
+  -content_image $CONTENT_IMAGE \
+  -style_image $STYLE_IMAGE \
+  -init image -init_image out2.png \
+  -style_scale $STYLE_SCALE \
+  -print_iter 1 \
+  -style_weight $STYLE_WEIGHT \
+  -image_size 1024 \
+  -num_iterations 200 \
+  -output_image out3.png \
+  -tv_weight 0 \
+  -backend cudnn -cudnn_autotune
+
+th neural_style.lua \
+  -content_image $CONTENT_IMAGE \
+  -style_image $STYLE_IMAGE \
+  -init image -init_image out3.png \
+  -style_scale $STYLE_SCALE \
+  -print_iter 1 \
+  -style_weight $STYLE_WEIGHT \
+  -image_size 2048 \
+  -num_iterations 100 \
+  -output_image out4.png \
+  -tv_weight 0 \
+  -gpu 0,1 \
+  -backend cudnn
+
+th neural_style.lua \
+  -content_image $CONTENT_IMAGE \
+  -style_image $STYLE_IMAGE \
+  -init image -init_image out4.png \
+  -style_scale $STYLE_SCALE \
+  -print_iter 1 \
+  -style_weight $STYLE_WEIGHT \
+  -image_size 3620 \
+  -num_iterations 50 \
+  -save_iter 25 \
+  -output_image out5.png \
+  -tv_weight 0 \
+  -lbfgs_num_correction 5 \
+  -gpu 0,1,2,3 \
+  -multigpu_strategy 3,6,12 \
+  -backend cudnn

neural_style.lua

@@ -226,7 +226,8 @@ local function main(params)
     optim_state = {
       maxIter = params.num_iterations,
       verbose=true,
-      tolX=0,
+      tolX=-1,
+      tolFun=-1,
     }
     if params.lbfgs_num_correction > 0 then
       optim_state.nCorrection = params.lbfgs_num_correction