[Minor] Some local fixes in torch

diff --git a/contrib/torch/optim/Logger.lua b/contrib/torch/optim/Logger.lua
index 31928ecdf65c2390629816d9fb919a357f1ac33d..3c1da54d312a1cd2cb8b22cc360580709318950f 100644 (file)
--- a/contrib/torch/optim/Logger.lua
+++ b/contrib/torch/optim/Logger.lua
@@ -34,7 +34,6 @@ Example:
     logger:setlogscale(true)                 -- enable logscale on Y-axis
     logger:plot()                            -- and plot
 ]]
-require 'xlua'
 local Logger = torch.class('optim.Logger')
 
 function Logger:__init(filename, timestamp)

diff --git a/contrib/torch/torch7/lib/TH/THGeneral.c b/contrib/torch/torch7/lib/TH/THGeneral.c
index b9491c9f3c2b044043c5a3ff3990c4ecc904e468..6ad96b51c70255fcac1cbb440922430f7325c389 100644 (file)
--- a/contrib/torch/torch7/lib/TH/THGeneral.c
+++ b/contrib/torch/torch7/lib/TH/THGeneral.c
@@ -25,7 +25,7 @@
 static void defaultErrorHandlerFunction(const char *msg, void *data)
 {
   printf("$ Error: %s\n", msg);
-  exit(-1);
+  abort();
 }
 
 static THErrorHandlerFunction defaultErrorHandler = defaultErrorHandlerFunction;