Skip to content

Commit 0c2a1bc

Browse files
committed
[travis] run pytest
1 parent b26eaf7 commit 0c2a1bc

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ install:
2222
- sudo -E $SCRIPTS/travis_install.sh
2323

2424
before_script:
25-
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
25+
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/cuda/lib64
26+
- export PATH=/home/travis/miniconda/bin:$PATH
2627
- if ! $WITH_CMAKE; then $SCRIPTS/travis_setup_makefile_config.sh; fi
2728

2829
script: $SCRIPTS/travis_build_and_test.sh

scripts/travis/travis_build_and_test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ else
2626
$MAKE all
2727
$MAKE test
2828
$MAKE pycaffe
29+
$MAKE pytest
2930
$MAKE warn
3031
if ! $WITH_CUDA; then
3132
$MAKE lint

scripts/travis/travis_install.sh

+11
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,14 @@ $MAKE
5757
$MAKE install
5858
popd
5959
rm -f $LMDB_FILE
60+
61+
# Install the Python runtime dependencies via miniconda (this is much faster
62+
# than using pip for everything).
63+
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
64+
chmod +x miniconda.sh
65+
./miniconda.sh -b
66+
export PATH=/home/travis/miniconda/bin:$PATH
67+
conda update --yes conda
68+
conda install --yes numpy scipy matplotlib scikit-image pip
69+
pip install protobuf
70+
rm /home/travis/miniconda/lib/libm.*

scripts/travis/travis_setup_makefile_config.sh

+10
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,13 @@ if $WITH_CUDA; then
1010
GENCODE="$GENCODE -gencode arch=compute_50,code=compute_50"
1111
echo "CUDA_ARCH := $GENCODE" >> Makefile.config
1212
fi
13+
14+
cat << 'EOF' >> Makefile.config
15+
ANACONDA_HOME := $(HOME)/miniconda
16+
PYTHON_INCLUDE := $(ANACONDA_HOME)/include \
17+
$(ANACONDA_HOME)/include/python2.7 \
18+
$(ANACONDA_HOME)/lib/python2.7/site-packages/numpy/core/include
19+
PYTHON_LIB := $(ANACONDA_HOME)/lib
20+
INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include
21+
LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib
22+
EOF

0 commit comments

Comments
 (0)