From caf841358aa8819d8489fea228b610369a2f5a30 Mon Sep 17 00:00:00 2001 From: Clement Farabet Date: Thu, 28 Jul 2011 14:35:56 -0400 Subject: Added condition on the loading of certain modules. (the reason is that those modules are going to be available in the new torch version) --- init.lua | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 40edc52..bbe5662 100644 --- a/init.lua +++ b/init.lua @@ -54,23 +54,27 @@ torch.include('nnx', 'Probe.lua') -- OpenMP module: torch.include('nnx', 'OmpModule.lua') --- pointwise modules: -torch.include('nnx', 'Abs.lua') -torch.include('nnx', 'Power.lua') -torch.include('nnx', 'Square.lua') -torch.include('nnx', 'Sqrt.lua') -torch.include('nnx', 'HardShrink.lua') -torch.include('nnx', 'Threshold.lua') +-- those packages are available in a beta branch of Torch7, +-- and will soon disapear from here +if not nn.Abs then + -- pointwise modules: + torch.include('nnx', 'Abs.lua') + torch.include('nnx', 'Power.lua') + torch.include('nnx', 'Square.lua') + torch.include('nnx', 'Sqrt.lua') + torch.include('nnx', 'HardShrink.lua') + torch.include('nnx', 'Threshold.lua') --- table-based modules: -torch.include('nnx', 'CMulTable.lua') -torch.include('nnx', 'CAddTable.lua') -torch.include('nnx', 'CDivTable.lua') -torch.include('nnx', 'CSubTable.lua') + -- table-based modules: + torch.include('nnx', 'CMulTable.lua') + torch.include('nnx', 'CAddTable.lua') + torch.include('nnx', 'CDivTable.lua') + torch.include('nnx', 'CSubTable.lua') --- reshapers: -torch.include('nnx', 'Narrow.lua') -torch.include('nnx', 'Replicate.lua') + -- reshapers: + torch.include('nnx', 'Narrow.lua') + torch.include('nnx', 'Replicate.lua') +end -- spatial (images) operators: torch.include('nnx', 'SpatialLinear.lua') -- cgit v1.2.3