Skip to content

Commit

Permalink
Updates for 5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbw committed Feb 3, 2016
1 parent 72e3d04 commit 3a64bef
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 34 deletions.
58 changes: 30 additions & 28 deletions build_all.sh
@@ -1,11 +1,13 @@
# Issues:
# - lua-sundown isn't compatible with 5.1 (goto keywords used, https://github.com/torch/sundown-ffi/issues/5)
# - lua-crypto isn't compatible with 5.3 (there is a fork, see lua-crypto/build.sh)
# - lua-paths isn't compatible with 5.3 (https://github.com/torch/paths/issues/18) (affects torch, and everything downstream)
# - lua-sdl2 only works with LuaJIT, depends on "jit" variable (https://github.com/torch/sdl2-ffi/issues/7)
# - lua-audio doesn't work with 5.3
# - lua-threads doesn't work with 5.3
# - lua-image doesn't work with 5.3
# - lua-luabitop fails for 5.3
# - lua-lzmq has an ffi-only version. Should use that eventually.
# - lua-trepl doesn't work with readline+luajit+linux.


conda build lua-5.1.5 &&
conda build lua-5.2.4 &&
conda build lua-5.3.2 &&
Expand All @@ -24,38 +26,38 @@ conda build lua-lbase64 --lua="all" &&
conda build lua-llthreads2 --lua="all" &&
conda build lua-lzmq --lua="all" &&
conda build lua-fftw3 --lua="all" &&
conda build lua-sdl2 --lua=2.0 &&
conda build lua-sundown --lua=5.2 --lua=5.3 --lua=2.0 &&
conda build lua-sdl2 --lua="all" &&
conda build lua-sundown --lua="all" &&
conda build lua-class --lua="all" &&
conda build lua-crypto --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-cwrap --lua="all" &&
conda build lua-dok --lua=5.2 --lua=5.3 --lua=2.0 &&
conda build lua-paths --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-torch --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-sys --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-xlua --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-trepl --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-audio --lua=5.2 --lua=2.0 &&
conda build lua-gnuplot --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-env --lua=5.2 --lua=2.0 &&
conda build lua-graph --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-threads --lua=2.0 &&
conda build lua-image --lua=5.2 --lua=2.0 &&
conda build lua-cephes --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-randomkit --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-distributions --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-nn --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-nngraph --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-totem --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-dok --lua="all" &&
conda build lua-paths --lua="all" &&
conda build lua-torch --lua="all" &&
conda build lua-sys --lua="all" &&
conda build lua-xlua --lua="all" &&
conda build lua-trepl --lua="all" &&
conda build lua-audio --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-gnuplot --lua="all" &&
conda build lua-env --lua="all" &&
conda build lua-graph --lua="all" &&
conda build lua-threads --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-image --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-cephes --lua="all" &&
conda build lua-randomkit --lua="all" &&
conda build lua-distributions --lua="all" &&
conda build lua-nn --lua="all" &&
conda build lua-nngraph --lua="all" &&
conda build lua-totem --lua="all" &&
conda build lua-luabitop --lua=5.1 --lua=5.2 &&
conda build lua-hdf5 --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-optim --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-pprint --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-signal --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-nnx --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-optim --lua="all" &&
conda build lua-pprint --lua="all" &&
conda build lua-signal --lua="all" &&
conda build lua-nnx --lua="all" &&
conda build llvm-clang-3.5.2 &&
conda build lua-terra --lua=2.0 &&
conda build lua-itorch --lua=5.2 --lua=2.0 &&
conda build lua-itorch --lua=5.1 --lua=5.2 --lua=2.0 &&
conda build lua-science --lua=5.2 --lua=2.0

# Contingent on CUDA
Expand Down
2 changes: 1 addition & 1 deletion lua-paths/meta.yaml
Expand Up @@ -4,7 +4,7 @@ package:

source:
git_url: https://github.com/torch/paths.git
git_rev: 3c0dc8f
git_rev: 68d579a2d3b1b0bb03a11637632e6e699b14ad80

build:
number: 1
Expand Down
2 changes: 1 addition & 1 deletion lua-sdl2/meta.yaml
Expand Up @@ -5,7 +5,7 @@ package:
source:
git_url: https://github.com/torch/sdl2-ffi.git
# git_tag: # can also be a branch, but that is highly discouraged
git_rev: e3d861d # 2e4c9002be0cf523b3f28755b1cf855d3553677f # prefer tags over commits, commits over branches
git_rev: 50659fbeca83d667240b197298a0462c7ec0ad21
# md5:
# patches:
# List any patch files here
Expand Down
2 changes: 1 addition & 1 deletion lua-sundown/meta.yaml
Expand Up @@ -4,7 +4,7 @@ package:

source:
git_url: https://github.com/torch/sundown-ffi.git
git_rev: f631a979f644c571c801dc664ef10c2f56136882
git_rev: 743faf433ff69086f88b70ac98fcb0d9297b4cb1

build:
number: 1
Expand Down
6 changes: 4 additions & 2 deletions lua-terra/meta.yaml
Expand Up @@ -15,13 +15,15 @@ build:

requirements:
build:
- lua >=2.0,<5
- lua
- luarocks
- llvm-clang ==3.5.2
- lua-luaffi [not luajit]
run:
- lua >=2.0,<3
- lua
- luarocks
- llvm-clang ==3.5.2
- lua-luaffi [not luajit]

test:
commands:
Expand Down
2 changes: 1 addition & 1 deletion lua-torch/meta.yaml
Expand Up @@ -4,7 +4,7 @@ package:

source:
git_url: https://github.com/torch/torch7.git
git_rev: c05de78096a8f85f7de13000cc4b0b584299940d
git_rev: f056171b5187d6b8228af60ff8d840ff45ad0e93

build:
number: 1
Expand Down

0 comments on commit 3a64bef

Please sign in to comment.