From f17434ddf93906fe6f8ac7a15c62217717c96b8e Mon Sep 17 00:00:00 2001 From: Brandon Lin Date: Fri, 8 Dec 2017 04:13:00 -0800 Subject: [PATCH 01/16] fix Dockerfile: specify version tag for cuda-torch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e93b3ea..55cbf53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kaixhin/cuda-torch +FROM kaixhin/cuda-torch:7.5 RUN apt-get update && apt-get install -y --no-install-recommends --force-yes \ libsnappy-dev \ From ead75a2c9cdae2da7c4e168250e76d18bdb09d91 Mon Sep 17 00:00:00 2001 From: nagadomi Date: Mon, 19 Feb 2018 05:14:59 +0900 Subject: [PATCH 02/16] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0aad0d3..11379f6 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,8 @@ sudo apt-get install libgraphicsmagick1-dev #### Install Torch7 -See: [Getting started with Torch](http://torch.ch/docs/getting-started.html) +See: [Getting started with Torch](http://torch.ch/docs/getting-started.html), and [#222](https://github.com/nagadomi/waifu2x/issues/222) + And install luarocks packages. ``` From 864da27fb1078ccf87ce31c2b2f120087e76781a Mon Sep 17 00:00:00 2001 From: nagadomi Date: Tue, 13 Mar 2018 11:23:52 +0900 Subject: [PATCH 03/16] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 11379f6..a26394e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ And it supports photo. The demo application can be found at http://waifu2x.udp.jp/ . +Note that I only provide this website. Other software or website claiming "waifu2x" has nothing to do with me. + ## Summary Click to see the slide show. From 52bc0b88732457b3f11c033e09f42a4193a814a2 Mon Sep 17 00:00:00 2001 From: nagadomi Date: Tue, 13 Mar 2018 11:24:54 +0900 Subject: [PATCH 04/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a26394e..997afc1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ And it supports photo. The demo application can be found at http://waifu2x.udp.jp/ . -Note that I only provide this website. Other software or website claiming "waifu2x" has nothing to do with me. +Note that I only provide this website and this repository. Other software or website claiming "waifu2x" has nothing to do with me. ## Summary From 55e1264f81bc804cf9768cb548ba43218c82c8d3 Mon Sep 17 00:00:00 2001 From: nagadomi Date: Thu, 5 Apr 2018 06:26:39 +0900 Subject: [PATCH 05/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 997afc1..5ef4d21 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ And it supports photo. The demo application can be found at http://waifu2x.udp.jp/ . -Note that I only provide this website and this repository. Other software or website claiming "waifu2x" has nothing to do with me. +__Note that I only provide this website and this repository. Other software or website claiming "waifu2x" has nothing to do with me.__ ## Summary From c2d00ea0772fbb2ac2ff898389c6773f8369459a Mon Sep 17 00:00:00 2001 From: nagadomi Date: Sat, 28 Apr 2018 17:49:22 +0900 Subject: [PATCH 06/16] Add note about little-cms2 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ef4d21..2c07dbf 100644 --- a/README.md +++ b/README.md @@ -84,11 +84,12 @@ sudo apt-get install libsnappy-dev sudo apt-get install libgraphicsmagick1-dev ``` +Note: waifu2x requires little-cms2 linked graphicsmagick. if you use macOS/homebrew, See [#174](https://github.com/nagadomi/waifu2x/issues/174#issuecomment-384466451). + #### Install Torch7 See: [Getting started with Torch](http://torch.ch/docs/getting-started.html), and [#222](https://github.com/nagadomi/waifu2x/issues/222) - And install luarocks packages. ``` luarocks install graphicsmagick # upgrade From 5aa375add4de001faba781b68b9d32d296242c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com> Date: Mon, 6 Aug 2018 20:06:00 +0800 Subject: [PATCH 07/16] Update zh-CN: Add translation of nr_low --- webgen/locales/zh-CN.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/webgen/locales/zh-CN.yml b/webgen/locales/zh-CN.yml index 810c351..9a089a7 100644 --- a/webgen/locales/zh-CN.yml +++ b/webgen/locales/zh-CN.yml @@ -12,6 +12,7 @@ photo: 照片 noise_reduction: 降噪程度 expect_jpeg: 可能会产生JPEG噪点 nr_none: 不降噪 +nr_low: 低 nr_medium: 中 nr_high: 高 nr_highest: 最高 From 7f6af49d1e042b44f71baf8811e385f90b308966 Mon Sep 17 00:00:00 2001 From: nagadomi Date: Tue, 7 Aug 2018 09:35:56 +0900 Subject: [PATCH 08/16] Update zh-CN --- assets/index.zh-CN.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/index.zh-CN.html b/assets/index.zh-CN.html index ac7ad21..a2fcaca 100644 --- a/assets/index.zh-CN.html +++ b/assets/index.zh-CN.html @@ -126,7 +126,7 @@