From 5ab2c605c8898f55ff9826851e1099dbace75e1b Mon Sep 17 00:00:00 2001
From: nagadomi <nagadomi@nurs.or.jp>
Date: Sun, 8 Nov 2015 18:31:46 +0900
Subject: [PATCH] Fix header include order issues

---
 tools/benchmark.lua     | 3 +--
 tools/cleanup_model.lua | 1 +
 tools/cudnn2cunn.lua    | 6 +-----
 tools/cunn2cudnn.lua    | 6 +-----
 tools/export_model.lua  | 1 +
 train.lua               | 2 +-
 waifu2x.lua             | 2 +-
 web.lua                 | 2 +-
 8 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tools/benchmark.lua b/tools/benchmark.lua
index 1f3d957..7967034 100644
--- a/tools/benchmark.lua
+++ b/tools/benchmark.lua
@@ -1,8 +1,7 @@
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "..", "lib", "?.lua;") .. package.path
 require 'xlua'
-require 'pl'
-
 require 'w2nn'
 local iproc = require 'iproc'
 local reconstruct = require 'reconstruct'
diff --git a/tools/cleanup_model.lua b/tools/cleanup_model.lua
index 40d6b26..7229ef7 100644
--- a/tools/cleanup_model.lua
+++ b/tools/cleanup_model.lua
@@ -1,3 +1,4 @@
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "..", "lib", "?.lua;") .. package.path
 
diff --git a/tools/cudnn2cunn.lua b/tools/cudnn2cunn.lua
index f6ff60b..5c8030e 100644
--- a/tools/cudnn2cunn.lua
+++ b/tools/cudnn2cunn.lua
@@ -1,11 +1,7 @@
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "..", "lib", "?.lua;") .. package.path
 require 'os'
-require 'pl'
-require 'torch'
-require 'cutorch'
-require 'cunn'
-require 'cudnn'
 require 'w2nn'
 local srcnn = require 'srcnn'
 
diff --git a/tools/cunn2cudnn.lua b/tools/cunn2cudnn.lua
index 8bb82f3..d4c198d 100644
--- a/tools/cunn2cudnn.lua
+++ b/tools/cunn2cudnn.lua
@@ -1,11 +1,7 @@
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "..", "lib", "?.lua;") .. package.path
 require 'os'
-require 'pl'
-require 'torch'
-require 'cutorch'
-require 'cunn'
-require 'cudnn'
 require 'w2nn'
 local srcnn = require 'srcnn'
 
diff --git a/tools/export_model.lua b/tools/export_model.lua
index 56588da..422b12a 100644
--- a/tools/export_model.lua
+++ b/tools/export_model.lua
@@ -1,4 +1,5 @@
 -- adapted from https://github.com/marcan/cl-waifu2x
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "..", "lib", "?.lua;") .. package.path
 require 'w2nn'
diff --git a/train.lua b/train.lua
index 4cb8b97..9a354f8 100644
--- a/train.lua
+++ b/train.lua
@@ -1,8 +1,8 @@
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "lib", "?.lua;") .. package.path
 require 'optim'
 require 'xlua'
-require 'pl'
 
 require 'w2nn'
 local settings = require 'settings'
diff --git a/waifu2x.lua b/waifu2x.lua
index 4f915e1..6af193d 100644
--- a/waifu2x.lua
+++ b/waifu2x.lua
@@ -1,7 +1,7 @@
+require 'pl'
 local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 package.path = path.join(path.dirname(__FILE__), "lib", "?.lua;") .. package.path
 require 'sys'
-require 'pl'
 require 'w2nn'
 local iproc = require 'iproc'
 local reconstruct = require 'reconstruct'
diff --git a/web.lua b/web.lua
index 09696a8..3ab413b 100644
--- a/web.lua
+++ b/web.lua
@@ -1,5 +1,5 @@
-local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 require 'pl'
+local __FILE__ = (function() return string.gsub(debug.getinfo(2, 'S').source, "^@", "") end)()
 local ROOT = path.dirname(__FILE__)
 package.path = path.join(ROOT, "lib", "?.lua;") .. package.path
 _G.TURBO_SSL = true