Fix header include order issues

asherascout · Nov 8, 2015 · 5ab2c60 · 5ab2c60
1 parent 180e767
commit 5ab2c60
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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