Skip to content
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
4 changes: 1 addition & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,14 @@ jobs:
tar xzf eigen-5.0.1.tar.gz &&
cmake -S eigen-5.0.1 -B eigen-build -DCMAKE_INSTALL_PREFIX=/usr/local -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DBUILD_TESTING=OFF &&
cmake --install eigen-build
CIBW_ENVIRONMENT_LINUX: 'CPATH="/usr/local/include/eigen3"'
CIBW_BEFORE_BUILD_LINUX: pip install pybind11[global]

# Install Eigen and pybind11 on macOS
CIBW_BEFORE_ALL_MACOS: brew install eigen pybind11
CIBW_ENVIRONMENT_MACOS: 'CPLUS_INCLUDE_PATH="/opt/homebrew/include/eigen3:/usr/local/include/eigen3"'

# Install Eigen and pybind11 on Windows images (no brew, need Eigen >= 3.4)
CIBW_BEFORE_ALL_WINDOWS: "choco install eigen -y"
CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_ARGS="-DCMAKE_PREFIX_PATH=C:\ProgramData\chocolatey\lib\eigen -DCMAKE_INCLUDE_PATH=C:\ProgramData\chocolatey\lib\eigen\include\eigen3"'
CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_ARGS="-DCMAKE_PREFIX_PATH=C:\ProgramData\chocolatey\lib\eigen"'
CIBW_BEFORE_BUILD_WINDOWS: pip install pybind11[global] delvewheel

# cibuildwheel doesn't yet ship a default repair command for Windows
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
run: |
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
brew install eigen pybind11
export CPLUS_INCLUDE_PATH="/home/linuxbrew/.linuxbrew/opt/eigen/include/eigen3:$CPLUS_INCLUDE_PATH"
export CMAKE_PREFIX_PATH="/home/linuxbrew/.linuxbrew/opt/eigen"
export CMAKE_ARGS="-DCMAKE_PREFIX_PATH=/home/linuxbrew/.linuxbrew/opt/eigen"
pip install .
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif()
# Add project sources to python module
file(GLOB SOURCES src/*.cpp)
pybind11_add_module(gofit ${SOURCES})
target_include_directories(gofit PRIVATE ${EIGEN3_INCLUDE_DIR})
target_link_libraries(gofit PRIVATE Eigen3::Eigen)

# EXAMPLE_VERSION_INFO is defined by setup.py and passed into the C++ code as a
# define (VERSION_INFO) here.
Expand Down
Loading