Updated for lua 5.2.2

april-org · Aug 26, 2013 · adf5549 · adf5549
1 parent 721ca1a
commit adf5549
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 35 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -695,24 +695,23 @@ For details and rationale, see http://www.lua.org/license.html .
 
 ===============================================================================
 
-Copyright (C) 1994-2008 Lua.org, PUC-Rio.
+Copyright © 1994–2013 Lua.org, PUC-Rio.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ===============================================================================
diff --git a/README.md b/README.md
@@ -35,10 +35,10 @@ different libraries. It is simple, you do
 
 where TARGET is one of the following, depending on which version you want:
 
-- ATLAS: release/debug
-- Intel MKL: release-mkl/debug-mkl
-- Intel MKL + CUDA: release-cuda-mkl/debug-cuda-mkl
-- Mac OS X Accelerate Framework: release-macosx/debug-macosx
+- ATLAS: make release (use build_release.lua), make debug (build_debug.lua)
+- Intel MKL: make or make release-mkl (build_mkl_release.lua), make debug-mkl (build_mkl_debug.lua)
+- Intel MKL + CUDA: make release-cuda-mkl (build_cuda_and_mkl_release.lua), make debug-cuda-mkl (build_cuda_and_mkl_debug.lua)
+- Mac OS X Accelerate Framework: make release-macosx (build_release_macosx.lua), make debug-macosx (build_debug_macosx.lua)
 
 Each of this targets will need a little configuration depending on your library
 installation. For example, in order to compile with MKL, the file build_mkl_release.lua contains
@@ -118,10 +118,9 @@ erase the package name from this list to avoid its compilation.
 
 Includes these sources
 ----------------------
-- LUA virtual machine 5.1.4: http://www.lua.org/
-- Luiz's lstrip for Lua 5.1: http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lstrip.tar.gz
+- LUA virtual machine 5.2.2: http://www.lua.org/
+- Luiz's lstrip for Lua 5.1, adapted to compile with Lua 5.2.2: http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lstrip.tar.gz
 - MersenneTwister: http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
-- GZIO: http://luaforge.net/projects/gzio/
 - Median filter from Simon Perreault: http://nomis80.org/ctmf.html
 - RuningStat class for efficient and stable computation of mean and variance: http://www.johndcook.com/standard_deviation.html
 

diff --git a/build_cuda_and_mkl_debug.lua b/build_cuda_and_mkl_debug.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_cuda_and_mkl_debug"
 
 luapkg{

diff --git a/build_cuda_and_mkl_release.lua b/build_cuda_and_mkl_release.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_cuda_and_mkl_release"
 
 luapkg{

diff --git a/build_debug.lua b/build_debug.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_debug"
 
 luapkg{

diff --git a/build_debug_macosx.lua b/build_debug_macosx.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_debug_macosx"
 
 luapkg{

diff --git a/build_release.lua b/build_release.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_release"
 
 luapkg{

diff --git a/build_release_macosx.lua b/build_release_macosx.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_release_macosx"
 
 luapkg{

diff --git a/build_release_pi.lua b/build_release_pi.lua
@@ -1,3 +1,4 @@
+dofile("binding/formiga.lua")
 formiga.build_dir = "build_release_pi"
 
 luapkg{

diff --git a/makefile b/makefile
@@ -1,40 +1,40 @@
 ALL: release-mkl
 
 document:
-	lua -l formiga build_release.lua document
+	lua build_release.lua document
 
 test-macosx:
-	lua -l formiga build_debug_macosx.lua test
+	lua build_debug_macosx.lua test
 
 test-mkl:
-	lua -l formiga build_mkl_debug.lua test
+	lua build_mkl_debug.lua test
 
 #test:
-#	lua -l formiga build_debug.lua test
+#	lua build_debug.lua test
 
 #test-cuda-mkl:
-#	lua -l formiga build_cuda_and_mkl_debug.lua test
+#	lua build_cuda_and_mkl_debug.lua test
 
 release-macosx:
-	lua -l formiga build_release_macosx.lua
+	lua build_release_macosx.lua
 
 release-mkl:
-	lua -l formiga build_mkl_release.lua
+	lua build_mkl_release.lua
 
 release:
-	lua -l formiga build_release.lua
+	lua build_release.lua
 
 release-cuda-mkl:
-	lua -l formiga build_cuda_and_mkl_release.lua
+	lua build_cuda_and_mkl_release.lua
 
 debug-macosx:
-	lua -l formiga build_debug_macosx.lua
+	lua build_debug_macosx.lua
 
 debug-mkl:
-	lua -l formiga build_mkl_debug.lua
+	lua build_mkl_debug.lua
 
 debug:
-	lua -l formiga build_debug.lua
+	lua build_debug.lua
 
 debug-cuda-mkl:
-	lua -l formiga build_cuda_and_mkl_debug.lua
+	lua build_cuda_and_mkl_debug.lua