Skip to content

Commit 4e7af81

Browse files
committed
[Py] Upgrade pybind11 to 2.11.1
1 parent 3378590 commit 4e7af81

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

.github/workflows/toolchain/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ inputs:
1212
type: string
1313
tools-version:
1414
required: false
15-
default: '0.1.1'
15+
default: '0.1.2'
1616
type: string
1717
tools-url:
1818
required: false

.github/workflows/wheel-short-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
config = ["${{ matrix.config }}"]
6464
generator = "Ninja Multi-Config"
6565
[cmake.options]
66-
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master;$staging/casadi"
66+
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.11.1;$staging/eigen-master;$staging/casadi"
6767
USE_GLOBAL_PYBIND11 = "On"
6868
ALPAQA_WITH_CUTEST = "On"
6969
EOF
@@ -203,7 +203,7 @@ jobs:
203203
run: |
204204
cat > py-build-cmake.local.toml <<- EOF
205205
[cmake.options]
206-
CMAKE_Fortran_COMPILER = ""
206+
CMAKE_Fortran_COMPILER = "NOTFOUND"
207207
EOF
208208
shell: bash
209209
- name: Build wheels

.github/workflows/wheel.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
restore-keys: ${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ env.HOST }}-ccache
4747
# Pip install dependencies
4848
- name: Install Python dependencies
49-
run: python${{ env.PYTHON_VERSION }} -m pip install -U pip build pybind11-stubgen~=0.16.2 py-build-cmake~=0.2.0a7
49+
run: python${{ env.PYTHON_VERSION }} -m pip install -U pip build pybind11-stubgen~=0.16.2 py-build-cmake~=0.2.0a11
5050
# Build
5151
- name: Native build
5252
run: |
@@ -127,7 +127,7 @@ jobs:
127127
restore-keys: ${{ runner.os }}-${{ matrix.pypy }}${{ matrix.python-version }}-${{ matrix.host }}-ccache
128128
# Pip install dependencies
129129
- name: Install Python dependencies
130-
run: python${{ matrix.python-version }} -m pip install -U pip build pybind11-stubgen~=0.16.2 py-build-cmake~=0.2.0a7
130+
run: python${{ matrix.python-version }} -m pip install -U pip build pybind11-stubgen~=0.16.2 py-build-cmake~=0.2.0a11
131131
# Download stubs
132132
- name: Download stubs
133133
uses: actions/download-artifact@v3
@@ -146,7 +146,7 @@ jobs:
146146
config = ["Debug", "Release"]
147147
generator = "Ninja Multi-Config"
148148
[cmake.options]
149-
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master;$staging/casadi"
149+
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.11.1;$staging/eigen-master;$staging/casadi"
150150
USE_GLOBAL_PYBIND11 = "On"
151151
ALPAQA_WITH_CUTEST = "On"
152152
EOF
@@ -216,7 +216,7 @@ jobs:
216216
config = ["Debug"]
217217
generator = "Ninja Multi-Config"
218218
[cmake.options]
219-
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master;$staging/casadi"
219+
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.11.1;$staging/eigen-master;$staging/casadi"
220220
USE_GLOBAL_PYBIND11 = "On"
221221
ALPAQA_WITH_CUTEST = "On"
222222
EOF
@@ -309,7 +309,7 @@ jobs:
309309
run: |
310310
cat > py-build-cmake.local.toml <<- EOF
311311
[cmake.options]
312-
CMAKE_Fortran_COMPILER = ""
312+
CMAKE_Fortran_COMPILER = "NOTFOUND"
313313
EOF
314314
shell: bash
315315
- name: Build wheels

conanfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def requirements(self):
7373
if self.options.with_json:
7474
self.requires("nlohmann_json/3.11.2", transitive_headers=True)
7575
if self.options.with_python:
76-
self.requires("pybind11/2.10.1")
76+
self.requires("pybind11/2.11.1")
7777
if self.options.with_matlab:
7878
self.requires("utfcpp/4.0.1")
7979
if self.options.with_blas:

pyproject.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ alpaqa = "alpaqa.__main__:main"
4040

4141
[build-system]
4242
requires = [
43-
"py-build-cmake~=0.2.0a7",
44-
"pybind11>=2.10.1,!=2.10.2,!=2.10.3,!=2.10.4,!=2.11.*",
43+
"py-build-cmake~=0.2.0a11",
44+
"pybind11==2.11.1",
4545
"pybind11-stubgen~=0.16.2",
4646
]
4747
build-backend = "py_build_cmake.build"
@@ -81,6 +81,7 @@ install_components = ["python_modules", "python_stubs"]
8181
"ALPAQA_WITH_UBSAN_DEBUG:BOOL" = "Off"
8282
"ALPAQA_WITH_ASAN_DEBUG:BOOL" = "Off"
8383
"ALPAQA_DEBUG_CHECKS_EIGEN:BOOL" = "On"
84+
"CMAKE_BUILD_TYPE" = "Debug" # Forces pybind11 to keep debug symbols (https://github.com/pybind/pybind11/issues/4454)
8485

8586
[tool.py-build-cmake.linux.cmake]
8687
config = ["Debug", "Release"]

python/alpaqa-debug/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ description = "Debug symbols for the alpaqa package."
1717

1818
[build-system]
1919
requires = [
20-
"py-build-cmake~=0.2.0a7",
21-
"pybind11>=2.10.1,!=2.10.2,!=2.10.3,!=2.10.4,!=2.11.*",
20+
"py-build-cmake~=0.2.0a11",
21+
"pybind11==2.11.1",
2222
"pybind11-stubgen~=0.16.2"
2323
]
2424
build-backend = "py_build_cmake.build_component"

scripts/dev/install-locally.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -ex
77
triple="x86_64-centos7-linux-gnu"
88

99
# Download compiler
10-
download_url="https://github.com/tttapa/cross-python/releases/download/0.1.0"
10+
download_url="https://github.com/tttapa/cross-python/releases/download/0.1.2"
1111
tools_dir="$PWD/toolchains"
1212
pfx="$tools_dir/$triple"
1313
mkdir -p "$tools_dir"
@@ -18,10 +18,10 @@ fi
1818

1919
# Install QPALM
2020
if [ ! -d "$pfx/qpalm" ]; then
21-
qpalm_download="https://github.com/kul-optec/QPALM/releases/download/1.2.1"
22-
wget "$qpalm_download/QPALM-1.2.1-Linux.tar.gz" -O- | \
21+
qpalm_download="https://github.com/kul-optec/QPALM/releases/download/1.2.2"
22+
wget "$qpalm_download/QPALM-1.2.2-Linux.tar.gz" -O- | \
2323
tar xz -C "$pfx"
24-
mv "$pfx/QPALM-1.2.1-Linux" "$pfx/qpalm"
24+
mv "$pfx/QPALM-1.2.2-Linux" "$pfx/qpalm"
2525
fi
2626

2727
# Use ccache to cache compilation
@@ -66,7 +66,7 @@ cat <<- EOF > "$config"
6666
config = ["Debug", "Release"]
6767
generator = "Ninja Multi-Config"
6868
[cmake.options]
69-
CMAKE_FIND_ROOT_PATH = "$pfx/pybind11-master;$pfx/casadi;$pfx/eigen-master"
69+
CMAKE_FIND_ROOT_PATH = "$pfx/pybind11-2.11.1;$pfx/casadi;$pfx/eigen-master"
7070
USE_GLOBAL_PYBIND11 = "On"
7171
ALPAQA_PYTHON_DEBUG_CONFIG = "Debug"
7272
ALPAQA_WITH_PY_STUBS = "On"

0 commit comments

Comments
 (0)