Skip to content

Commit c1aaf3e

Browse files
authored
Sync Develop and Master for release 4.5.1 (#208)
* Fixes for v.4.5.1 (#207) * Update pypi.yml * Update bb.py Mirror from Master * Create param_parallelEval.txt * Create simpleExample_WithSurrogateAndVNS.py Example with VNS using Surrogate * Create param_VNSMadsSurrogateSearch.txt Batch mode example for VNS using surrogate * Fix handle of VNS using surrogate Option VNS_MADS_SEARCH_WITH_SURROGATE * Change how surrogate is handled in VNS search. * Disable VNS_MADS_SEARCH_WITH_SURROGATE when optimization with quad model * Update VNS.cpp Manage evaluator (Surrogate <-> bb) when doing vns with surrogate. * Update CONTRIBUTORS * Update Introduction.rst * Update pypi.yml * Update pyproject.toml * Update pyproject.toml * Use std::fabs when required (#206) The fix can be critical when std::abs is used instead of std::fabs * Change version number * Update QPSolverOptimize.cpp * Update pypi.yml Pass OpenMP as a string flag. Tested in PyNomad/setup.py * Update pypi.yml Temp changes for building wheels for Python 3.13 * Update pypi.yml Update to use latest cibuildwheel * Update pypi.yml Put back the oldest python version to 3.8.
1 parent 59cfd61 commit c1aaf3e

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/pypi.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,33 @@ jobs:
1414
os: windows-latest
1515
archs: AMD64
1616
msvc: 1
17+
openmp: 'TRUE'
1718

1819
- name: Ubuntu
1920
os: ubuntu-latest
2021
archs: x86_64
22+
openmp: 'TRUE'
2123

2224
- name: macOS_X86
2325
os: macos-latest
2426
archs: x86_64
2527
extra_option: -DCMAKE_OSX_ARCHITECTURES=x86_64
28+
openmp: 'FALSE'
2629

2730
- name: macOS_ARM
2831
os: macos-latest
2932
archs: arm64
3033
extra_option: -DCMAKE_OSX_ARCHITECTURES=arm64
34+
openm: 'FALSE'
3135

3236
name: Wheels for ${{ matrix.target.name }}
3337
runs-on: ${{ matrix.target.os }}
3438

3539
steps:
36-
- uses: actions/checkout@v3
37-
- uses: actions/setup-python@v4
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-python@v5
3842
with:
39-
python-version: '3.12'
43+
python-version: '3.13'
4044

4145
- name: Prepare Python environment
4246
run: >-
@@ -63,7 +67,7 @@ jobs:
6367
cmake --version
6468
6569
- name: Build binary wheels
66-
uses: pypa/cibuildwheel@v2.16.5
70+
uses: pypa/cibuildwheel@v2.23.3
6771
env:
6872
CIBW_ARCHS: >-
6973
${{ matrix.target.archs }}
@@ -75,7 +79,7 @@ jobs:
7579
NOMAD_BUILD_DIR=../../build
7680
NOMAD_MSVC_FLAG=${{ matrix.target.msvc }}
7781
NOMAD_MSVC_CONF=Release
78-
BUILD_OPENMP=TRUE
82+
BUILD_OPENMP=${{ matrix.target.openmp }}
7983
CIBW_PROJECT_REQUIRES_PYTHON: >-
8084
>=3.8
8185
CIBW_BUILD_FRONTEND: >-

0 commit comments

Comments
 (0)