Skip to content

Commit 95f6ecf

Browse files
kouwesm
authored andcommitted
ARROW-4152: [GLib] Remove an example to show Torch integration
Because Torch is not in active development. Author: Kouhei Sutou <[email protected]> Closes #3303 from kou/glib-remove-torch-example and squashes the following commits: b29a963 <Kouhei Sutou> Remove an example to show Torch integration
1 parent 1ff7978 commit 95f6ecf

File tree

6 files changed

+6
-137
lines changed

6 files changed

+6
-137
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ matrix:
256256
- ARROW_TRAVIS_USE_VENDORED_BOOST=1
257257
- ARROW_TRAVIS_PARQUET=1
258258
- ARROW_TRAVIS_PLASMA=1
259-
- BUILD_TORCH_EXAMPLE=no
260259
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
261260
before_script:
262261
- if [ $ARROW_CI_RUBY_AFFECTED != "1" ]; then exit; fi

c_glib/example/lua/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ dist_lua_example_DATA = \
2020
README.md \
2121
read-batch.lua \
2222
read-stream.lua \
23-
stream-to-torch-tensor.lua \
2423
write-batch.lua \
2524
write-stream.lua

c_glib/example/lua/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,3 @@ Here are example codes in this directory:
4848

4949
* `read-stream.lua`: It shows how to read Arrow array from file in
5050
stream mode.
51-
52-
* `stream-to-torch-tensor.lua`: It shows how to read Arrow array
53-
from file in stream mode and convert it to
54-
[Torch](http://torch.ch/)'s
55-
[`Tensor` object](http://torch7.readthedocs.io/en/rtd/tensor/index.html).

c_glib/example/lua/stream-to-torch-tensor.lua

Lines changed: 0 additions & 101 deletions
This file was deleted.

ci/travis_before_script_c_glib.sh

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,8 @@ gem install test-unit gobject-introspection
4444
if [ $TRAVIS_OS_NAME = "osx" ]; then
4545
sudo env PKG_CONFIG_PATH=$PKG_CONFIG_PATH luarocks install lgi
4646
else
47-
if [ $BUILD_TORCH_EXAMPLE = "yes" ]; then
48-
git clone \
49-
--quiet \
50-
--depth 1 \
51-
--recursive \
52-
https://github.com/torch/distro.git ~/torch
53-
pushd ~/torch
54-
./install-deps > /dev/null
55-
echo "yes" | ./install.sh > /dev/null
56-
. ~/torch/install/bin/torch-activate
57-
popd
58-
luarocks install lgi
59-
else
60-
sudo apt install -y -qq luarocks
61-
sudo luarocks install lgi
62-
fi
47+
sudo apt install -y -qq luarocks
48+
sudo luarocks install lgi
6349
fi
6450

6551
pushd $ARROW_C_GLIB_DIR

ci/travis_script_c_glib.sh

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,10 @@ arrow_c_glib_run_test()
3232
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$arrow_c_glib_lib_dir/pkgconfig
3333

3434
pushd example/lua
35-
if [ "$BUILD_TORCH_EXAMPLE" = "yes" ]; then
36-
. ~/torch/install/bin/torch-activate
37-
luajit write-batch.lua
38-
luajit read-batch.lua
39-
luajit write-stream.lua
40-
luajit read-stream.lua
41-
luajit stream-to-torch-tensor.lua
42-
else
43-
lua write-batch.lua
44-
lua read-batch.lua
45-
lua write-stream.lua
46-
lua read-stream.lua
47-
fi
35+
lua write-batch.lua
36+
lua read-batch.lua
37+
lua write-stream.lua
38+
lua read-stream.lua
4839
popd
4940
}
5041

0 commit comments

Comments
 (0)