[lua-torch-nngraph] 01/06: New upstream version 0~20170208-g3ed3b9b

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository lua-torch-nngraph.

commit 42c4b3f330d2b06de59c577e34f503f82f3405fb
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Jul 26 15:54:10 2017 +0000

    New upstream version 0~20170208-g3ed3b9b
---
 README.md              | 2 +-
 nngraph-scm-1.rockspec | 5 +----
 test/test_nngraph.lua  | 4 +++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 10c8ad0..db98f9b 100644
--- a/README.md
+++ b/README.md
@@ -187,7 +187,7 @@ L2 = nn.Tanh()(nn.Linear(30, 60)(nn.JoinTable(1)({input, L1}))):annotate{
    graphAttributes = {color = 'blue', fontcolor = 'green'}
 }
 L3 = nn.Tanh()(nn.Linear(80, 160)(nn.JoinTable(1)({L1, L2}))):annotate{
-   name = 'L3', descrption = 'Level 3 Node',
+   name = 'L3', description = 'Level 3 Node',
    graphAttributes = {color = 'green',
    style = 'filled', fillcolor = 'yellow'}
 }
diff --git a/nngraph-scm-1.rockspec b/nngraph-scm-1.rockspec
index 4963ecd..9cc28c7 100644
--- a/nngraph-scm-1.rockspec
+++ b/nngraph-scm-1.rockspec
@@ -21,10 +21,7 @@ dependencies = {
 build = {
    type = "command",
    build_command = [[
-cmake -E make_directory build;
-cd build;
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)"; 
-$(MAKE)
+cmake -E make_directory build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE)
    ]],
    install_command = "cd build && $(MAKE) install"
 }
diff --git a/test/test_nngraph.lua b/test/test_nngraph.lua
index 340ab24..0b06f9c 100644
--- a/test/test_nngraph.lua
+++ b/test/test_nngraph.lua
@@ -348,7 +348,9 @@ function test.test_gradInputType()
       tester:assert(hidden_a:label():match('DescB') ~= nil)
       local fg_tmpfile = os.tmpname()
       local bg_tmpfile = os.tmpname()
-      graph.dot(net.fg, 'Test', fg_tmpfile)
+      if not pcall(function() graph.dot(net.fg, 'Test', fg_tmpfile) end) then
+         return -- prevent graphviz not found error
+      end
       graph.dot(net.fg, 'Test BG', bg_tmpfile)
 
       local function checkDotFile(tmpfile)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lua-torch-nngraph.git