Skip to content

Commit

Permalink
trigger travis (#37)
Browse files Browse the repository at this point in the history
* trigger travis

* fix

* chomo

* make

* squash
  • Loading branch information
tqchen committed May 29, 2018
1 parent e6f27a2 commit cc468fd
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 11 deletions.
13 changes: 12 additions & 1 deletion nnvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ SRC = $(wildcard src/*.cc src/*/*.cc)
ALL_OBJ = $(patsubst src/%.cc, build/%.o, $(SRC))
ALL_DEP = $(ALL_OBJ)

UNAME_S := $(shell uname -s)

ifeq ($(UNAME_S), Darwin)
WHOLE_ARCH= -force_load
NO_WHOLE_ARCH= -noforce_load
else
WHOLE_ARCH= --whole-archive
NO_WHOLE_ARCH= --no-whole-archive
endif


include tests/cpp/unittest.mk

test: $(TEST)
Expand All @@ -27,7 +38,7 @@ lib/libnnvm.a: $(ALL_DEP)

lib/libnnvm_example.so: example/src/operator.cc lib/libnnvm.a
@mkdir -p $(@D)
$(CXX) $(CFLAGS) -shared -o $@ $(filter %.cc, $^) $(LDFLAGS) -Wl,--whole-archive lib/libnnvm.a -Wl,--no-whole-archive
$(CXX) $(CFLAGS) -shared -o $@ $(filter %.cc, $^) $(LDFLAGS) -Wl,${WHOLE_ARCH} lib/libnnvm.a -Wl,${NO_WHOLE_ARCH}

cython:
cd python; python setup.py build_ext --inplace
Expand Down
3 changes: 3 additions & 0 deletions nnvm/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# NNVM: Build deep learning system by parts

[![Build Status](https://travis-ci.org/dmlc/nnvm.svg?branch=master)](https://travis-ci.org/dmlc/nnvm)
[![GitHub license](http://dmlc.github.io/img/apache2.svg)](./LICENSE)

NNVM is not a deep learning library. It is a modular,
decentralized and lightweight part to help build deep learning libraries.

Expand Down
4 changes: 2 additions & 2 deletions nnvm/include/nnvm/pass_functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ inline Graph OrderMutation(Graph src) {
* The index of ShapeVector is given by graph.indexed_graph().entry_id
*/
inline Graph InferShape(Graph graph,
ShapeVector shape_inputs = {},
ShapeVector shape_inputs,
std::string shape_attr_key = "") {
if (shape_inputs.size() != 0) {
graph.attrs["shape_inputs"] = std::make_shared<any>(std::move(shape_inputs));
Expand All @@ -81,7 +81,7 @@ inline Graph InferShape(Graph graph,
* The index of ShapeVector is given by graph.indexed_graph().entry_id
*/
inline Graph InferType(Graph graph,
DTypeVector dtype_inputs = {},
DTypeVector dtype_inputs,
std::string dtype_attr_key = "") {
if (dtype_inputs.size() != 0) {
graph.attrs["dtype_inputs"] = std::make_shared<any>(std::move(dtype_inputs));
Expand Down
12 changes: 8 additions & 4 deletions nnvm/tests/travis/run_test.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,15 @@ if [ ${TASK} == "python_test" ]; then
nosetests3 tests/python/ || exit -1
fi

python -m nose tests/python/ || exit -1
python3 -m nose tests/python/ || exit -1
make cython || exit -1
make cython3 || exit -1
python -m nose tests/python/ || exit -1
python3 -m nose tests/python/ || exit -1

if [ ${TRAVIS_OS_NAME} == "osx" ]; then
python -m nose tests/python/ || exit -1
python3 -m nose tests/python/ || exit -1
else
nosetests tests/python/ || exit -1
nosetests3 tests/python/ || exit -1
fi
exit 0
fi
4 changes: 0 additions & 4 deletions nnvm/tests/travis/setup.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@ fi
if [ ${TASK} == "lint" ]; then
pip install cpplint 'pylint==1.4.4' 'astroid==1.3.6' --user `whoami`
fi

if [ ! -d dmlc-core ]; then
git clone https://github.com/dmlc/dmlc-core
fi
Empty file modified nnvm/tests/travis/travis_after_failure.sh
100644 → 100755
Empty file.

0 comments on commit cc468fd

Please sign in to comment.