Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Remove option to include pybind11/eigen.h.
This was for partial backwards compatibility with ndarray's old
Eigen interface, and is now being removed.
  • Loading branch information
TallJimbo committed Jul 29, 2019
commit 7ac22eb839fb6f3be98b45eab8b7357e947db9a6
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ tests/ndarray
tests/ndarray-eigen
tests/ndarray-fft
tests/swig_test_mod.py
include/ndarray/buildOptions.h
include/ndarray/Array.h
include/ndarray/ArrayBaseN.h
include/ndarray/ArrayRef.h
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ project(ndarray)
# only executed if NDARRAY_TEST is enabled.
option(NDARRAY_TEST "Enable tests?" ON)
option(NDARRAY_EIGEN "Enable Eigen tests?" ON)
option(NDARRAY_STDPYBIND11EIGEN "Enable standard pybind11 Eigen wrappers (requires Eigen > 3.2.5)?" OFF)
option(NDARRAY_FFTW "Enable FFTW tests?" ON)
option(NDARRAY_PYBIND11 "Enable Pybind11 tests?" OFF)

Expand Down
3 changes: 0 additions & 3 deletions include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ foreach(FILENAME ${PREPROCESS_FILES2})
)
endforeach(FILENAME)

# record certain build options
configure_file(ndarray/buildOptions.h.in "${CMAKE_CURRENT_SOURCE_DIR}/ndarray/buildOptions.h")

add_custom_target(preprocess_includes1 ALL DEPENDS ${PREPROCESS_FILES1})
add_custom_target(preprocess_includes2 ALL DEPENDS ${PREPROCESS_FILES2})
add_dependencies(preprocess_includes2 preprocess_includes1)
4 changes: 0 additions & 4 deletions include/ndarray/buildOptions.h.in

This file was deleted.

2 changes: 0 additions & 2 deletions include/ndarray/eigen_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#ifndef NDARRAY_eigen_fwd_h_INCLUDED
#define NDARRAY_eigen_fwd_h_INCLUDED

#include "ndarray/buildOptions.h"

/**
* @file ndarray/eigen_fwd.h
* @brief Forward declarations for ndarray/eigen interface.
Expand Down
6 changes: 0 additions & 6 deletions include/ndarray/pybind11.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,8 @@
#include "pybind11.h"
#include "pybind11/numpy.h"

#include "ndarray/buildOptions.h"
#ifdef NDARRAY_STDPYBIND11EIGEN
#include "pybind11/eigen.h"
#endif // NDARRAY_STDPYBIND11EIGEN

#include "ndarray.h"
#include "ndarray/eigen.h"
#include "ndarray/buildOptions.h"

namespace ndarray {

Expand Down
1 change: 0 additions & 1 deletion tests/ndarray-eigen.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* https://github.com/ndarray/ndarray
*/
#include "ndarray/eigen.h"
#include "ndarray/buildOptions.h"
#include "Eigen/SVD"

#define BOOST_TEST_DYN_LINK
Expand Down
1 change: 0 additions & 1 deletion tests/pybind11_test_mod.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "pybind11/pybind11.h"

#include "ndarray/pybind11.h"
#include "ndarray/buildOptions.h"

namespace py = pybind11;
using namespace py::literals;
Expand Down