Skip to content

Commit 0c774fc

Browse files
LecrisUTLecrisUT
committed
Replace usage of DOWNLOAD_EIGEN
1 parent e29d5de commit 0c774fc

8 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎.appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ build_script:
2828
-DPYBIND11_WERROR=ON
2929
-DPYBIND11_CATCH_TESTS=ON
3030
-DDOWNLOAD_CATCH=ON
31+
-DPYBIND11_EIGEN_TESTS=ON
3132
-DCMAKE_SUPPRESS_REGENERATION=1
3233
.
3334
- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

‎.github/CONTRIBUTING.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ system with CMake 3.15+:
8787
python3 -m venv .venv
8888
source .venv/bin/activate
8989
pip install -r tests/requirements.txt
90-
cmake -S . -B build -DPYBIND11_CATCH_TESTS=ON -DDOWNLOAD_EIGEN=ON
90+
cmake -S . -B build -DPYBIND11_CATCH_TESTS=ON -DPYBIND11_EIGEN_TESTS=ON
9191
cmake --build build -j4
9292
```
9393

@@ -151,7 +151,8 @@ The valid options are:
151151
* `-DBUILD_TESTING=ON`: Enable the tests
152152
* `-DPYBIND11_CATCH_TESTS=ON`: Enable tests using catch
153153
(Fetched automatically if missing)
154-
* `-DDOWNLOAD_EIGEN=ON`: Download Eigen for the NumPy tests
154+
* `-DPYBIND11_EIGEN_TESTS=ON`: Enable testing of Eigen for the NumPy tests
155+
(Fetched automatically if missing)
155156
* `-DPYBIND11_INSTALL=ON/OFF`: Enable the install target (on by default for the
156157
master project)
157158
* `-DUSE_PYTHON_INSTALL_DIR=ON`: Try to install into the python dir
@@ -296,7 +297,7 @@ recent CMake and Python):
296297
python3 -m venv venv
297298
. venv/bin/activate
298299
pip install pytest
299-
cmake -S . -B build-intel -DCMAKE_CXX_COMPILER=$(which icpc) -DPYBIND11_CATCH_TESTS=ON -DDOWNLOAD_EIGEN=ON -DPYBIND11_WERROR=ON
300+
cmake -S . -B build-intel -DCMAKE_CXX_COMPILER=$(which icpc) -DPYBIND11_CATCH_TESTS=ON -DPYBIND11_EIGEN_TESTS=ON -DPYBIND11_WERROR=ON
300301
```
301302

302303
This will test the PGI compilers:

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ jobs:
206206
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
207207
-DPYBIND11_PYTEST_ARGS=-v
208208
-DPYBIND11_CATCH_TESTS=ON
209-
-DDOWNLOAD_EIGEN=ON
209+
-DPYBIND11_EIGEN_TESTS=ON
210210
-DCMAKE_CXX_STANDARD=14
211211
-DPYBIND11_INTERNALS_VERSION=10000000
212212
@@ -311,6 +311,8 @@ jobs:
311311
-DPYBIND11_CATCH_TESTS=ON
312312
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
313313
-DCMAKE_CXX_FLAGS="${{ matrix.cxx_flags }}"
314+
-DPYBIND11_EIGEN_TESTS=ON
315+
-DCMAKE_REQUIRE_FIND_PACKAGE_Eigen3=ON
314316
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
315317
316318
- name: Build
@@ -496,6 +498,8 @@ jobs:
496498
-DPYBIND11_CATCH_TESTS=ON
497499
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
498500
-DCMAKE_CXX_FLAGS="${{ matrix.cxx_flags }}"
501+
-DPYBIND11_EIGEN_TESTS=ON
502+
-DCMAKE_REQUIRE_FIND_PACKAGE_Eigen3=ON
499503
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
500504
501505
- name: Build
@@ -571,7 +575,7 @@ jobs:
571575
cmake -S . -B build-11 \
572576
-DPYBIND11_WERROR=ON \
573577
-DPYBIND11_CATCH_TESTS=ON \
574-
-DDOWNLOAD_EIGEN=OFF \
578+
-DPYBIND11_EIGEN_TESTS=OFF \
575579
-DCMAKE_CXX_STANDARD=11 \
576580
-DCMAKE_CXX_COMPILER=$(which icpc) \
577581
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
@@ -609,7 +613,7 @@ jobs:
609613
cmake -S . -B build-17 \
610614
-DPYBIND11_WERROR=ON \
611615
-DPYBIND11_CATCH_TESTS=ON \
612-
-DDOWNLOAD_EIGEN=OFF \
616+
-DPYBIND11_EIGEN_TESTS=OFF \
613617
-DCMAKE_CXX_STANDARD=17 \
614618
-DCMAKE_CXX_COMPILER=$(which icpc) \
615619
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
@@ -687,7 +691,7 @@ jobs:
687691
-DCMAKE_BUILD_TYPE=MinSizeRel
688692
-DPYBIND11_WERROR=ON
689693
-DPYBIND11_CATCH_TESTS=ON
690-
-DDOWNLOAD_EIGEN=ON
694+
-DPYBIND11_EIGEN_TESTS=ON
691695
-DCMAKE_CXX_STANDARD=11
692696
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
693697
@@ -746,6 +750,8 @@ jobs:
746750
cmake ../pybind11-tests
747751
-DPYBIND11_CATCH_TESTS=ON
748752
-DPYBIND11_WERROR=ON
753+
-DPYBIND11_EIGEN_TESTS=ON
754+
-DCMAKE_REQUIRE_FIND_PACKAGE_Eigen3=ON
749755
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
750756
working-directory: /build-tests
751757

@@ -839,7 +845,7 @@ jobs:
839845
-G "Visual Studio 17 2022" -A Win32
840846
-DPYBIND11_WERROR=ON
841847
-DPYBIND11_CATCH_TESTS=ON
842-
-DDOWNLOAD_EIGEN=ON
848+
-DPYBIND11_EIGEN_TESTS=ON
843849
${{ matrix.args }}
844850
- name: Build C++11
845851
run: cmake --build build -j 2
@@ -890,7 +896,7 @@ jobs:
890896
-DCMAKE_BUILD_TYPE=Debug
891897
-DPYBIND11_WERROR=ON
892898
-DPYBIND11_CATCH_TESTS=ON
893-
-DDOWNLOAD_EIGEN=ON
899+
-DPYBIND11_EIGEN_TESTS=ON
894900
${{ matrix.args }}
895901
- name: Build C++11
896902
run: cmake --build build --config Debug -j 2
@@ -930,7 +936,7 @@ jobs:
930936
cmake -S . -B build
931937
-DPYBIND11_WERROR=ON
932938
-DPYBIND11_CATCH_TESTS=ON
933-
-DDOWNLOAD_EIGEN=ON
939+
-DPYBIND11_EIGEN_TESTS=ON
934940
-DCMAKE_CXX_STANDARD=20
935941
936942
- name: Build C++20
@@ -954,7 +960,7 @@ jobs:
954960
cmake -S . -B build_partial
955961
-DPYBIND11_WERROR=ON
956962
-DPYBIND11_CATCH_TESTS=ON
957-
-DDOWNLOAD_EIGEN=ON
963+
-DPYBIND11_EIGEN_TESTS=ON
958964
-DCMAKE_CXX_STANDARD=20
959965
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
960966
@@ -1125,7 +1131,7 @@ jobs:
11251131
-DPYBIND11_WERROR=OFF
11261132
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
11271133
-DPYBIND11_CATCH_TESTS=ON
1128-
-DDOWNLOAD_EIGEN=ON
1134+
-DPYBIND11_EIGEN_TESTS=ON
11291135
-DCMAKE_CXX_COMPILER=clang++
11301136
-DCMAKE_CXX_STANDARD=17
11311137
@@ -1193,7 +1199,7 @@ jobs:
11931199
-DPYBIND11_WERROR=OFF `
11941200
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF `
11951201
-DPYBIND11_CATCH_TESTS=ON `
1196-
-DDOWNLOAD_EIGEN=ON `
1202+
-DPYBIND11_EIGEN_TESTS=ON `
11971203
-DCMAKE_CXX_COMPILER=clang++ `
11981204
-DCMAKE_CXX_STANDARD=20 `
11991205
-DPython_EXECUTABLE="$pythonExecutable" `
@@ -1268,7 +1274,7 @@ jobs:
12681274
cmake -S . -B build
12691275
-DPYBIND11_WERROR=OFF
12701276
-DPYBIND11_CATCH_TESTS=ON
1271-
-DDOWNLOAD_EIGEN=ON
1277+
-DPYBIND11_EIGEN_TESTS=ON
12721278
-DCMAKE_CXX_COMPILER=clang++
12731279
-DCMAKE_CXX_STANDARD=20
12741280
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")

‎.github/workflows/reusable-standard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
-DPYBIND11_WERROR=ON
7474
-DPYBIND11_PYTEST_ARGS=-v
7575
-DPYBIND11_CATCH_TESTS=ON
76-
-DDOWNLOAD_EIGEN=ON
76+
-DPYBIND11_EIGEN_TESTS=ON
7777
${{ inputs.cmake-args }}
7878
7979
- name: Build

‎.github/workflows/upstream.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
cmake -S . -B build11
5656
-DPYBIND11_WERROR=ON
5757
-DPYBIND11_CATCH_TESTS=ON
58-
-DDOWNLOAD_EIGEN=ON
58+
-DPYBIND11_EIGEN_TESTS=ON
5959
-DCMAKE_CXX_STANDARD=11
6060
-DCMAKE_BUILD_TYPE=Debug
6161
@@ -78,7 +78,7 @@ jobs:
7878
cmake -S . -B build17
7979
-DPYBIND11_WERROR=ON
8080
-DPYBIND11_CATCH_TESTS=ON
81-
-DDOWNLOAD_EIGEN=ON
81+
-DPYBIND11_EIGEN_TESTS=ON
8282
-DCMAKE_CXX_STANDARD=17
8383
8484
- name: Build C++17
@@ -97,7 +97,7 @@ jobs:
9797
cmake -S . -B build17max
9898
-DPYBIND11_WERROR=ON
9999
-DPYBIND11_CATCH_TESTS=ON
100-
-DDOWNLOAD_EIGEN=ON
100+
-DPYBIND11_EIGEN_TESTS=ON
101101
-DCMAKE_CXX_STANDARD=17
102102
-DPYBIND11_INTERNALS_VERSION=10000000
103103

‎CMakePresets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"CMAKE_BUILD_TYPE": "Debug",
1515
"CMAKE_EXPORT_COMPILE_COMMANDS": true,
1616
"PYBIND11_CATCH_TESTS": true,
17-
"DOWNLOAD_EIGEN": true,
17+
"PYBIND11_EIGEN_TESTS": true,
1818
"PYBIND11_FINDPYTHON": "NEW",
1919
"PYBIND11_WERROR": true,
2020
"CMAKE_COLOR_DIAGNOSTICS": true

‎noxfile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def tests(session: nox.Session) -> None:
4444
f"-B{tmpdir}",
4545
"-DPYBIND11_WERROR=ON",
4646
"-DPYBIND11_CATCH_TESTS=ON",
47-
"-DDOWNLOAD_EIGEN=ON",
47+
"-DPYBIND11_EIGEN_TESTS=ON",
4848
*session.posargs,
4949
)
5050
session.run("cmake", "--build", tmpdir)

‎tests/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ if(PYBIND11_EIGEN_TESTS AND PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
366366
if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
367367
list(REMOVE_AT PYBIND11_TEST_FILES ${PYBIND11_TEST_FILES_EIGEN_I})
368368
endif()
369-
message(STATUS "Building tests WITHOUT Eigen, use -DDOWNLOAD_EIGEN=ON to download")
370369
endif()
371370
endif()
372371

0 commit comments

Comments
 (0)