From 9ebd0fcedc0aa830dcbad483d67d252ed543bf2d Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Sun, 3 Jan 2016 19:02:06 -0800 Subject: [PATCH 1/2] Use pymatsolver in TravisCI --- .travis.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c8637af..db79b031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,16 @@ python: sudo: false +addons: + apt: + packages: + - gcc + - gfortran + - libopenmpi-dev + - libmumps-seq-dev + - libblas-dev + - liblapack-dev + env: - TEST_DIR="tests/mesh tests/base tests/utils" - TEST_DIR=tests/examples @@ -23,9 +33,12 @@ before_install: # Install packages install: - - conda install --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib cython ipython + - conda install --yes pip python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib cython ipython nose - pip install nose-cov python-coveralls - # - pip install -r requirements.txt + + - git clone https://github.com/rowanc1/pymatsolver.git + - cd pymatsolver; python setup.py install; cd .. + - python setup.py install - python setup.py build_ext --inplace From 00a29d27aa6f1bb0815342a5e3d4cf862db34d36 Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Sun, 3 Jan 2016 19:11:45 -0800 Subject: [PATCH 2/2] Decrease the number of iterations on the EM derivatives. This is to increase the speed at which travis runs tests. --- tests/em/fdem/inverse/derivs/test_FDEM_derivs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/em/fdem/inverse/derivs/test_FDEM_derivs.py b/tests/em/fdem/inverse/derivs/test_FDEM_derivs.py index 52108c4e..d3bcb218 100644 --- a/tests/em/fdem/inverse/derivs/test_FDEM_derivs.py +++ b/tests/em/fdem/inverse/derivs/test_FDEM_derivs.py @@ -38,7 +38,7 @@ def derivTest(fdemType, comp): survey = prb.survey def fun(x): return survey.dpred(x), lambda x: prb.Jvec(x0, x) - return Tests.checkDerivative(fun, x0, num=3, plotIt=False, eps=FLR) + return Tests.checkDerivative(fun, x0, num=2, plotIt=False, eps=FLR) class FDEM_DerivTests(unittest.TestCase):