From 9a3b5ef566ad7c57b6509511e53f9dbe58340268 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 6 Oct 2018 09:26:18 +0100 Subject: [PATCH] [Minor] Don't load torch unless really needed --- lualib/lua_nn.lua | 15 +++++++++------ rules/rspamd.lua | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lualib/lua_nn.lua b/lualib/lua_nn.lua index d0d2d5265..d16f0a768 100644 --- a/lualib/lua_nn.lua +++ b/lualib/lua_nn.lua @@ -20,9 +20,13 @@ local exports = {} local lua_nn_models = {} -if rspamd_config:has_torch() then - torch = require "torch" - torch.setnumthreads(1) +local conf_section = rspamd_config:get_all_opt("nn_models") + +if conf_section then + if rspamd_config:has_torch() then + torch = require "torch" + torch.setnumthreads(1) + end end if torch then @@ -43,10 +47,9 @@ if torch then end end end - local section = rspamd_config:get_all_opt("nn_models") - if section and type(section) == 'table' then - for k,v in pairs(section) do + if conf_section and type(conf_section) == 'table' then + for k,v in pairs(conf_section) do if not rspamd_config:add_map(v, "nn map " .. k, gen_process_callback(k)) then rspamd_logger.warnx(rspamd_config, 'cannot load NN map %1', k) end diff --git a/rules/rspamd.lua b/rules/rspamd.lua index 67136cc6e..646dc5afd 100644 --- a/rules/rspamd.lua +++ b/rules/rspamd.lua @@ -65,4 +65,4 @@ if rmaps and type(rmaps) == 'table' then end local rspamd_nn = require "lua_nn" -rspamd_nn.load_rspamd_nn() -- Load defined models \ No newline at end of file +rspamd_nn.load_rspamd_nn() -- Load defined models if any \ No newline at end of file -- 2.39.5