conform to new split structuresplit

7 files changed, 54 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 26ec4de..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
-CMAKE_POLICY(VERSION 2.6)
-IF(LUAROCKS_PREFIX)
-    MESSAGE(STATUS "Installing Torch through Luarocks")
-    STRING(REGEX REPLACE "(.*)lib/luarocks/rocks.*" "\\1" CMAKE_INSTALL_PREFIX  "${LUAROCKS_PREFIX}")
-    MESSAGE(STATUS "Prefix inferred from Luarocks: ${CMAKE_INSTALL_PREFIX}")
-ENDIF()
-FIND_PACKAGE(Torch REQUIRED)
-
-SET(src)
-FILE(GLOB luasrc *.lua)
-ADD_TORCH_PACKAGE(optim "${src}" "${luasrc}")
-#ADD_TORCH_DOK(dok optim "Machine Learning" "Optimization" 3.2)
diff --git a/dok/index.dok b/doc/README.md
index 532ecf5..532ecf5 100644
--- a/dok/index.dok
+++ b/doc/README.md
diff --git a/init.lua b/init.lua
index 0330f4d..5eb72ef 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,7 @@
 
 require 'torch'
 require 'sys'
+require 'paths'
 
 optim = {}
 
diff --git a/optim-1.0.3-0.rockspec b/rocks/optim-1.0.3-0.rockspec
index 29578c0..29578c0 100644
--- a/optim-1.0.3-0.rockspec
+++ b/rocks/optim-1.0.3-0.rockspec
diff --git a/optim-1.0.3-1.rockspec b/rocks/optim-1.0.3-1.rockspec
index 9035edc..9035edc 100644
--- a/optim-1.0.3-1.rockspec
+++ b/rocks/optim-1.0.3-1.rockspec
diff --git a/optim-1.0.4-0.rockspec b/rocks/optim-1.0.4-0.rockspec
index d956a2c..d956a2c 100644
--- a/optim-1.0.4-0.rockspec
+++ b/rocks/optim-1.0.4-0.rockspec
diff --git a/rocks/optim-1.0.4-1.rockspec b/rocks/optim-1.0.4-1.rockspec
new file mode 100644
index 0000000..76be376
--- /dev/null
+++ b/rocks/optim-1.0.4-1.rockspec
@@ -0,0 +1,53 @@
+package = "optim"
+version = "1.0.4-1"
+
+source = {
+   url = "git://github.com/torch/optim",
+   tag = "1.0.4-0"
+}
+
+description = {
+   summary = "An optimization library for Torch.",
+   detailed = [[
+      This package contains several optimization routines for Torch.   
+  ]],
+   homepage = "https://github.com/torch/optim",
+   license = "BSD"
+}
+
+dependencies = {
+   "torch >= 7.0",
+   "sys >= 1.0",
+   "paths"
+}
+
+build = {
+   type= "builtin",
+   modules = {
+
+      ["optim.init"] = "init.lua",
+
+      -- optimization algorithms
+      ["optim.adagrad"] = "adagrad.lua",
+      ["optim.asgd"] = "asgd.lua",
+      ["optim.cg"] = "cg.lua",
+      ["optim.fista"] = "fista.lua",
+      ["optim.lbfgs"] = "lbfgs.lua",
+      ["optim.rprop"] = "rprop.lua",
+      ["optim.sgd"] = "sgd.lua",
+
+      -- line search tools
+      ["optim.lswolfe"] = "lswolfe.lua",
+      ["optim.polyinterp"] = "polyinterp.lua",
+
+      -- general tools
+      ["optim.Logger"] = "Logger.lua",
+      ["optim.ConfusionMatrix"] = "ConfusionMatrix.lua"
+   }
+
+   install = {
+      lua = {
+         ["optim.doc.README"] = "doc/README.md",
+      }
+   }
+}