Skip to content
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.

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

Fix eigen3 paths #44

Merged
merged 6 commits into from
Dec 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 23 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: cpp
matrix:
include:
- os: osx
osx_image: xcode10.1
osx_image: xcode11.2
env:
- LIBLA=arma
addons:
Expand All @@ -16,7 +16,7 @@ matrix:
update: true

- os: osx
osx_image: xcode10.1
osx_image: xcode11.2
env:
- LIBLA=eigen
addons:
Expand All @@ -29,12 +29,13 @@ matrix:
update: true

- os: linux
dist: xenial
dist: bionic
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- cmake
- liblapack-dev
- libblas-dev
- libboost-dev
Expand All @@ -47,24 +48,25 @@ matrix:
- CXX=g++-7
- LIBLA=arma

# - os: linux
# dist: xenial
# addons:
# apt:
# sources:
# - ubuntu-toolchain-r-test
# packages:
# - liblapack-dev
# - libblas-dev
# - libboost-dev
# - libeigen3-dev
# - g++-7
# - lcov
# update: true
# env:
# - CC=gcc-7
# - CXX=g++-7
# - LIBLA=eigen
- os: linux
dist: bionic
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- cmake
- liblapack-dev
- libblas-dev
- libboost-dev
- libeigen3-dev
- g++-7
- lcov
update: true
env:
- CC=gcc-7
- CXX=g++-7
- LIBLA=eigen

script:
- bash .travis/build.sh
Expand Down
6 changes: 3 additions & 3 deletions include/libirc/linalg.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#ifdef HAVE_ARMA
#include <armadillo>
#elif HAVE_EIGEN3
#include <Eigen/Dense>
#include <Eigen/Geometry>
#include <Eigen/LU>
#include <eigen3/Eigen/Dense>
#include <eigen3/Eigen/Geometry>
#include <eigen3/Eigen/LU>
#else
#error
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/test/atom_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <armadillo>
using arma::vec3;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
#else
#error
Expand Down
2 changes: 1 addition & 1 deletion src/test/connectivity_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using mat = arma::mat;
template<typename T>
using Mat = arma::Mat<T>;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down
2 changes: 1 addition & 1 deletion src/test/io_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using arma::mat;
using arma::vec;
using arma::vec3;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down
2 changes: 1 addition & 1 deletion src/test/irc_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ using mat = arma::mat;
template<typename T>
using Mat = arma::Mat<T>;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down
2 changes: 1 addition & 1 deletion src/test/linalg_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using vec3 = arma::vec3;
using vec = arma::vec;
using mat = arma::mat;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down
2 changes: 1 addition & 1 deletion src/test/mathtools_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using mat = arma::mat;
template<typename T>
using Mat = arma::Mat<T>;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down
2 changes: 1 addition & 1 deletion src/test/molecule_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <armadillo>
using arma::vec3;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
#else
#error
Expand Down
2 changes: 1 addition & 1 deletion src/test/transformation_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using mat = arma::mat;
template<typename T>
using Mat = arma::Mat<T>;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down
2 changes: 1 addition & 1 deletion src/test/wilson_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ using vec3 = arma::vec3;
using vec = arma::vec;
using mat = arma::mat;
#elif HAVE_EIGEN3
#include <Eigen3/Eigen/Dense>
#include <eigen3/Eigen/Dense>
using vec3 = Eigen::Vector3d;
using vec = Eigen::VectorXd;
using mat = Eigen::MatrixXd;
Expand Down