Skip to content

Rebase of #76: boost headers test variant #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TallJimbo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Rebase of #76: boost headers test variant #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbedadc
Switch to Boost unit test headers
brianv0 Jul 18, 2019
895af53
Switch to conda-forge
brianv0 Jul 18, 2019
27bb0bf
Pin pybind11 to 2.2 branch
brianv0 Jul 18, 2019
019620b
Add -lrt for old versions of glibc (conda-forge)
brianv0 Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ install:
- conda update -q conda
# Useful for debugging any issues with conda
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION boost fftw numpy pybind11 cmake gxx_linux-64 eigen
- conda create -q -n test-environment
- source activate test-environment
- conda config --env --add channels conda-forge
- conda install python=$TRAVIS_PYTHON_VERSION boost fftw numpy pybind11=2.2.* cmake compilers eigen
- export BOOST_DIR=$CONDA_PREFIX
- export EIGEN_DIR=$CONDA_PREFIX
- export FFTW_DIR=$CONDA_PREFIX
- export CMAKE_PREFIX_PATH=$CONDA_PREFIX
# For conda-forge's old glibc
- export LDFLAGS="-lrt ${LDFLAGS}"

script:
- mkdir build
Expand Down
3 changes: 1 addition & 2 deletions tests/ndarray-eigen.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
#include "ndarray/eigen.h"
#include "Eigen/SVD"

#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE ndarray-eigen
#include "boost/test/unit_test.hpp"
#include "boost/test/included/unit_test.hpp"

template <typename T, typename U>
void testElements2(T const & a, U const & b) {
Expand Down
3 changes: 1 addition & 2 deletions tests/ndarray-fft.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
*/
#include <ndarray/fft.h>

#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE ndarray-fft
#include "boost/test/unit_test.hpp"
#include "boost/test/included/unit_test.hpp"

#include <sstream>

Expand Down
3 changes: 1 addition & 2 deletions tests/ndarray.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
*/
#include "ndarray.h"

#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE ndarray
#include "boost/test/unit_test.hpp"
#include "boost/test/included/unit_test.hpp"

BOOST_AUTO_TEST_CASE(sizes) {
std::cerr << "sizeof(int): " << sizeof(int) << "\n";
Expand Down
3 changes: 1 addition & 2 deletions tests/views.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
*/
#include "ndarray.h"

#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE views
#include "boost/test/unit_test.hpp"
#include "boost/test/included/unit_test.hpp"

template <typename T, int N, int C>
int templateC(ndarray::ArrayRef<T,N,C> const &) { return C; }
Expand Down