From 4ad71ab77c9d26c8da0c9505afc8971cb4161290 Mon Sep 17 00:00:00 2001 From: nagadomi Date: Sun, 18 Nov 2018 20:29:15 +0900 Subject: [PATCH] Update README --- README.md | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index fe6f521..f09a588 100644 --- a/README.md +++ b/README.md @@ -21,21 +21,8 @@ waifu2x is inspired by SRCNN [1]. 2D character picture (HatsuneMiku) is licensed - [2] "For Creators", http://piapro.net/en_for_creators.html ## Public AMI -``` -Region: us-east-1 (N.Virginia) -AMI ID: ami-b9be23ae -AMI NAME: waifu2x-server 20160807 -Instance Type: g2.2xlarge -OS: Ubuntu 14.04 -User: ubuntu -Created at: 2016-08-07 -``` -See ~/README.md -Please update the git repo first. -``` -git pull -``` +TODO ## Third Party Software @@ -63,7 +50,7 @@ If you are a windows user, I recommend you to use [waifu2x-caffe](https://github ## Installation ### Setting Up the Command Line Tool Environment - (on Ubuntu 14.04) + (on Ubuntu 16.04) #### Install CUDA @@ -71,6 +58,8 @@ See: [NVIDIA CUDA Getting Started Guide for Linux](http://docs.nvidia.com/cuda/c Download [CUDA](http://developer.nvidia.com/cuda-downloads) +Note: Torch does not supported CUDA10. CUDA9.2 is recommended. + ``` sudo dpkg -i cuda-repo-ubuntu1404_7.5-18_amd64.deb sudo apt-get update @@ -82,6 +71,7 @@ sudo apt-get install cuda ``` sudo apt-get install libsnappy-dev sudo apt-get install libgraphicsmagick1-dev +sudo apt-get install libssl1.0-dev # for web server ``` Note: waifu2x requires little-cms2 linked graphicsmagick. if you use macOS/homebrew, See [#174](https://github.com/nagadomi/waifu2x/issues/174#issuecomment-384466451). @@ -90,28 +80,19 @@ Note: waifu2x requires little-cms2 linked graphicsmagick. if you use macOS/homeb 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 -luarocks install threads # upgrade -luarocks install lua-csnappy -luarocks install md5 -luarocks install uuid -luarocks install csvigo - -# if you need to use web application -PREFIX=$HOME/torch/install luarocks install turbo - -# if you need to use cuDNN library. cuDNN is required. -luarocks install cudnn -``` - #### Getting waifu2x ``` git clone --depth 1 https://github.com/nagadomi/waifu2x.git ``` +and install lua modules. + +``` +cd waifu2x +./install_lua_modules.sh +``` + #### Validation Testing the waifu2x command line tool.