Add support for photo model in web.lua

assets/index.de.html

@@ -87,13 +87,11 @@
 		Kunst
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Foto
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.es.html

@@ -87,13 +87,11 @@
 		Ilustración
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Fotografía
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.fr.html

@@ -87,13 +87,11 @@
 		Dessin
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Photo
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.html

@@ -87,13 +87,11 @@
 		Artwork
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Photo
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.ja.html

@@ -87,13 +87,11 @@
 		イラスト
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		写真
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.pt.html

@@ -87,13 +87,11 @@
 		Arte
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Foto
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.ru.html

@@ -87,13 +87,11 @@
 		Арт
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Фотография
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.tr.html

@@ -87,13 +87,11 @@
 		Dijital Çizim
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		Fotoğraf
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

assets/index.zh-CN.html

@@ -87,13 +87,11 @@
 		插图
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		照片
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">

web.lua

@@ -42,17 +42,25 @@ if cudnn then
 end
 opt.force_cudnn = opt.force_cudnn == 1
 local ART_MODEL_DIR = path.join(ROOT, "models", "upconv_7", "art")
-local PHOTO_MODEL_DIR = path.join(ROOT, "models", "photo")
-local art_model = {}
-art_model.scale = w2nn.load_model(path.join(ART_MODEL_DIR, "scale2.0x_model.t7"), opt.force_cudnn)
-art_model.noise1_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise1_scale2.0x_model.t7"), opt.force_cudnn)
-art_model.noise2_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise2_scale2.0x_model.t7"), opt.force_cudnn)
-art_model.noise3_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise3_scale2.0x_model.t7"), opt.force_cudnn)
-art_model.noise1 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise1_model.t7"), opt.force_cudnn)
-art_model.noise2 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise2_model.t7"), opt.force_cudnn)
-art_model.noise3 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise3_model.t7"), opt.force_cudnn)
-local photo_model = art_model -- TODO
-
+local PHOTO_MODEL_DIR = path.join(ROOT, "models", "upconv_7", "photo")
+local art_model = {
+   scale = w2nn.load_model(path.join(ART_MODEL_DIR, "scale2.0x_model.t7"), opt.force_cudnn),
+   noise1_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise1_scale2.0x_model.t7"), opt.force_cudnn),
+   noise2_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise2_scale2.0x_model.t7"), opt.force_cudnn),
+   noise3_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise3_scale2.0x_model.t7"), opt.force_cudnn),
+   noise1 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise1_model.t7"), opt.force_cudnn),
+   noise2 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise2_model.t7"), opt.force_cudnn),
+   noise3 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise3_model.t7"), opt.force_cudnn)
+}
+local photo_model = {
+   scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "scale2.0x_model.t7"), opt.force_cudnn),
+   noise1_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise1_scale2.0x_model.t7"), opt.force_cudnn),
+   noise2_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise2_scale2.0x_model.t7"), opt.force_cudnn),
+   noise3_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise3_scale2.0x_model.t7"), opt.force_cudnn),
+   noise1 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise1_model.t7"), opt.force_cudnn),
+   noise2 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise2_model.t7"), opt.force_cudnn),
+   noise3 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise3_model.t7"), opt.force_cudnn)
+}
 collectgarbage()
 local CLEANUP_MODEL = false -- if you are using the low memory GPU, you could use this flag.
 local CACHE_DIR = path.join(ROOT, "cache")

webgen/templates/index.html.erb

@@ -87,13 +87,11 @@
 		<%= t[:artwork] %>
 	      </span>
 	    </label>
-	    <!--
 	    <label><input type="radio" name="style" class="radio" value="photo">
 	      <span class="r-text">
 		<%= t[:photo] %>
 	      </span>
 	    </label>
-	    -->
 	  </div>
 	</div>
 	<div class="option-box">