Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
987 commits
Select commit Hold shift + click to select a range
4ee762c
Fix lrn
fwesselm Oct 7, 2025
e69db0f
Handle unboundedness
fwesselm Oct 7, 2025
88d6b89
More unboundedness handling
fwesselm Oct 7, 2025
64ac7d2
Fix comment
fwesselm Oct 7, 2025
a3ffc75
Simplify
fwesselm Oct 7, 2025
35e30f8
Tree parallelism now uses TaskGroup
filikat Oct 7, 2025
1cd77b2
Move some code around
fwesselm Oct 7, 2025
297690e
Remove some duplicate code
fwesselm Oct 7, 2025
cc30671
Simplify some more
fwesselm Oct 7, 2025
614dcb9
Simplify again
fwesselm Oct 8, 2025
65a598a
Avoid re-computation
fwesselm Oct 8, 2025
33d73b8
Use existing utility
fwesselm Oct 8, 2025
f166e24
Now to add suggested_user_cost_scale and suggested_user_bound_scale t…
jajhall Oct 8, 2025
64a4243
Now introduce Highs::getUserScaling
jajhall Oct 8, 2025
0e57fc1
Added bound strengthening
fwesselm Oct 8, 2025
b0c7cc6
Minor change
fwesselm Oct 8, 2025
471d784
Merge branch 'latest' into pr-2555
galabovaa Oct 8, 2025
17edb3b
add fortran language explicitly to fortrantest
galabovaa Oct 8, 2025
c3597ab
Merge branch 'master' into pr-2555
galabovaa Oct 8, 2025
d23ed66
Comments
fwesselm Oct 8, 2025
af2c46f
gcc 13
galabovaa Oct 8, 2025
9c1c31a
setup-fortran v1
galabovaa Oct 8, 2025
db297c3
gf13
galabovaa Oct 8, 2025
b730745
try latest
galabovaa Oct 8, 2025
21eb81c
try gf14
galabovaa Oct 8, 2025
eb86d49
try 14 and LINKER_LANGUAGE
galabovaa Oct 8, 2025
f4b551a
fortran compiler
galabovaa Oct 8, 2025
e83caab
fortran compile
galabovaa Oct 8, 2025
0a841db
gfortran OK
galabovaa Oct 8, 2025
d9337bf
clean up
galabovaa Oct 8, 2025
8be5126
Assed applied to HighsUserScaleData
jajhall Oct 8, 2025
c739f41
Got rid of non-excessive cost/bound scaling suggestions
jajhall Oct 8, 2025
8ab465b
Radically reduced the scaling recommendations
jajhall Oct 8, 2025
db99c61
Directly remove fixed variables
fwesselm Oct 9, 2025
87b2d43
Use utility
fwesselm Oct 9, 2025
4ec765a
Simplify
fwesselm Oct 9, 2025
885491e
Clean up
fwesselm Oct 10, 2025
e9d193e
Comments
fwesselm Oct 10, 2025
3a08c7e
Count number of modified bounds
fwesselm Oct 10, 2025
11100e0
Check variable types
fwesselm Oct 10, 2025
5e2dde0
Minor
fwesselm Oct 10, 2025
06ed5d1
Merge pull request #2563 from ERGO-Code/pr-2555
galabovaa Oct 10, 2025
b21e224
Removing HighsModel::userCostScaleOk and HighsModel::userCostScale
jajhall Oct 10, 2025
3da61c1
Merge branch 'master' into latest
galabovaa Oct 10, 2025
1683e05
master in latest
galabovaa Oct 10, 2025
6c866a9
No need to pass clique info
fwesselm Oct 10, 2025
04b153e
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into pred…
fwesselm Oct 10, 2025
9de6d08
Minimized references to user_cost_scale short of changing the option …
jajhall Oct 10, 2025
04782cd
Round bounds
fwesselm Oct 10, 2025
0e4ee2f
Move some code around
fwesselm Oct 10, 2025
eb30703
Don't clear HighsHessian::start_ in HighsHessian::exactResize()?
jajhall Oct 11, 2025
5cb05bf
Fixed HighsHessian::exactResize()
jajhall Oct 11, 2025
9a89a21
Corrected error in userScaleHessian
jajhall Oct 11, 2025
29f7679
WIP
fwesselm Oct 13, 2025
e7cf47a
Revert accidental change
fwesselm Oct 13, 2025
7e7800f
Reintroduce type check
fwesselm Oct 13, 2025
c084520
Use special TaskGroup to avoid uncaught exception
filikat Oct 13, 2025
c40ce2b
Define openblas for windows
filikat Oct 13, 2025
6a0dc8a
install openblas using [threads] on windows
filikat Oct 13, 2025
ba4b101
Skip extremeEntries
filikat Oct 13, 2025
bf4df9d
WIP
fwesselm Oct 13, 2025
91f7d76
Adjust damping parameter for stepsizes
filikat Oct 13, 2025
c9ab05f
Merge pull request #2569 from ERGO-Code/master
galabovaa Oct 13, 2025
e37e8c5
works on windows locally with patched up metis
galabovaa Oct 13, 2025
9e67855
windows workflow
galabovaa Oct 13, 2025
a36d25a
ubuntu workflow
galabovaa Oct 13, 2025
782c751
macos workflow
galabovaa Oct 13, 2025
7adc867
fix typo in workflows
galabovaa Oct 13, 2025
91028c8
use bash shell
galabovaa Oct 13, 2025
419685e
Merge pull request #2571 from ERGO-Code/master
galabovaa Oct 13, 2025
4a8a880
github workspace
galabovaa Oct 13, 2025
70032ae
fix typo and add install config
galabovaa Oct 13, 2025
95f4508
try cygpath
galabovaa Oct 13, 2025
f6320ad
try again with typo fixed
galabovaa Oct 13, 2025
c14de51
installs prefix
galabovaa Oct 13, 2025
3c65e96
fix paths in workflows
galabovaa Oct 13, 2025
394e8ef
clean up
galabovaa Oct 13, 2025
7fb5045
openblas
galabovaa Oct 13, 2025
9917161
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into pred…
fwesselm Oct 14, 2025
36bacfe
Clean up again
fwesselm Oct 14, 2025
0d43c61
Remove unused lines
fwesselm Oct 14, 2025
c5c86c0
Another unused variable
fwesselm Oct 14, 2025
66137f3
latest metis working locally on macos
galabovaa Oct 14, 2025
54b3012
Merge pull request #2524 from mathgeekcoder/highspy-getobj
jajhall Oct 14, 2025
c035007
Move some things around
fwesselm Oct 15, 2025
4b1fbe7
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into pred…
fwesselm Oct 15, 2025
63c72f9
changes from hipo-dev
galabovaa Oct 15, 2025
a2ec883
Now passing hessian by reference to userScaleHessian so scaling is used!
jajhall Oct 15, 2025
f776c9b
Changed LP and QP in ill-scaled-model test case
jajhall Oct 15, 2025
e62f998
Log message
fwesselm Oct 15, 2025
4725cd2
workflows
galabovaa Oct 15, 2025
f9b2d97
Merge remote-tracking branch 'origin/latest' into hipo-tt
galabovaa Oct 15, 2025
926374d
wflow
galabovaa Oct 15, 2025
cacef11
Simplif
fwesselm Oct 15, 2025
22cac6c
try concise way
galabovaa Oct 15, 2025
4647e09
check overlay ports
galabovaa Oct 15, 2025
90a54a3
static on macos
galabovaa Oct 15, 2025
0cc64f1
add correct paths
galabovaa Oct 15, 2025
690e0df
see if I can reproduce the blas lookup issue
galabovaa Oct 15, 2025
3d19148
Merge branch 'latest' into hipo-dev
filikat Oct 15, 2025
5fa3a72
Added kMaximize test to TestUserScale.cpp
jajhall Oct 15, 2025
a17bd6d
shells
galabovaa Oct 15, 2025
d1e1ebc
Merge branch 'hipo-tt' into hipo-tt-j
galabovaa Oct 15, 2025
4a7470e
try blas root
galabovaa Oct 15, 2025
b5c7fc5
try hint
galabovaa Oct 15, 2025
da36aa2
path to highs
galabovaa Oct 15, 2025
e748ec8
[path to exe
galabovaa Oct 15, 2025
b37db9d
Merge branch 'hipo-tt' into hipo-tt-j
galabovaa Oct 15, 2025
330c1d3
try prefix
galabovaa Oct 15, 2025
8095977
path to exe 2
galabovaa Oct 15, 2025
446f0de
respect _ROOT in search order
galabovaa Oct 15, 2025
e08cefb
merge changes in
galabovaa Oct 15, 2025
372209c
fix typo
galabovaa Oct 15, 2025
79ea00a
Merge branch 'hipo-tt' into hipo-tt-j
galabovaa Oct 15, 2025
20115bf
gklib header
galabovaa Oct 15, 2025
75ccc61
gklib header
galabovaa Oct 15, 2025
b7ec8da
update linux blas lookup
galabovaa Oct 15, 2025
8f71881
revert undo
galabovaa Oct 15, 2025
2a137f9
openblas
galabovaa Oct 15, 2025
75a86b1
stick to find_library on linux
galabovaa Oct 15, 2025
79f3a67
private link to libs
galabovaa Oct 16, 2025
029d69e
Merge branch 'hipo-tt' into hipo-tt-j
galabovaa Oct 16, 2025
1144add
typo
galabovaa Oct 16, 2025
9182c8e
Need to reset user_scale option values between LP/MIP/QP models
jajhall Oct 16, 2025
23e499b
Merge branch 'hipo-tt' into hipo-tt-j
galabovaa Oct 16, 2025
48188cc
blas lookup for older win versions
galabovaa Oct 16, 2025
1197e66
blas lookup for older win versions
galabovaa Oct 16, 2025
145b157
fixes from hipo-tt
galabovaa Oct 15, 2025
0b34e0a
extra logging
galabovaa Oct 16, 2025
3938ce1
blas order on windows
galabovaa Oct 16, 2025
f919ec4
fix cmake windows blas lookup
galabovaa Oct 15, 2025
394191e
Update FindHipoDeps.cmake
galabovaa Oct 16, 2025
ae86904
Merge branch 'hipo-tt-j' into hipo-tt
galabovaa Oct 16, 2025
bf8e4fe
Simplify again
fwesselm Oct 16, 2025
62f44b3
Strange unit test failures
jajhall Oct 16, 2025
456c187
Merge branch 'latest' into fix-2460
jajhall Oct 16, 2025
d1ae8dd
cmake build type for metis too in tests
galabovaa Oct 16, 2025
ceba389
workflows
galabovaa Oct 16, 2025
95bd12f
fixes
galabovaa Oct 16, 2025
42b9d8d
Now to add large objective/bound tests for user scaling
jajhall Oct 16, 2025
dc852ec
Minor correction to nqueens.py
BenChampion Oct 16, 2025
ed429b8
added BLA_VENDOR for blas trampoline
galabovaa Oct 16, 2025
78f25a9
add vendor
galabovaa Oct 16, 2025
3f133de
on
galabovaa Oct 16, 2025
a20f928
and typo?
galabovaa Oct 16, 2025
7547cd1
unit workflows
galabovaa Oct 16, 2025
d9e641e
add tests for BLA_VENDOR
galabovaa Oct 16, 2025
fb5e7cf
cleanup
galabovaa Oct 16, 2025
fe8b1b5
add prefix
galabovaa Oct 17, 2025
e079ec3
Large bounds test OK for LP/MIP/QP
jajhall Oct 17, 2025
a3ff72d
just prefix too
galabovaa Oct 17, 2025
70e3fb2
Large bounds test OK for LP/MIP/QP
jajhall Oct 17, 2025
5336f92
Unit tests pass quietly
jajhall Oct 17, 2025
7f5ae41
prefix
galabovaa Oct 17, 2025
0233200
Now assigning return_status in all cases for userScaleStatus
jajhall Oct 17, 2025
a0a57b5
cmake find blas
galabovaa Oct 17, 2025
0b3afc0
more clean up
galabovaa Oct 17, 2025
d994b94
test ts branch
galabovaa Oct 17, 2025
a91c565
test both actually
galabovaa Oct 17, 2025
9a4e615
Merge remote-tracking branch 'origin/hipo-dev' into hipo-tt
galabovaa Oct 17, 2025
d4f9530
Add switch to use thread-safe metis
filikat Oct 17, 2025
2697433
Added Highs_getObjectiveBoundScaling (and Highs_getDualObjectiveValue…
jajhall Oct 17, 2025
86de861
Merge pull request #2554 from TendTo/feat/cuda
galabovaa Oct 17, 2025
a3000b8
ref gpu
galabovaa Oct 17, 2025
8b7d187
pip install works: now to create a Python test
jajhall Oct 17, 2025
8396ba6
Merge pull request #2578 from ERGO-Code/hipo-tt
galabovaa Oct 17, 2025
e040dd4
Merge pull request #2576 from ERGO-Code/nqueens-correction
galabovaa Oct 17, 2025
4bd175b
Added test_get_user_objective_bound_scale to tests/test_highspy.py
jajhall Oct 17, 2025
a26b889
Formatted
jajhall Oct 17, 2025
e7fbd33
Add some comments and move metis seed
filikat Oct 17, 2025
b9e3cd0
Update name of Metis-ts function
filikat Oct 17, 2025
fd4b6f5
Merge branch 'latest' into fix-2557
jajhall Oct 19, 2025
080579b
Merge pull request #2559 from ERGO-Code/fix-2557
jajhall Oct 19, 2025
5106cc1
merge latest in
galabovaa Oct 19, 2025
e282757
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into pred…
fwesselm Oct 20, 2025
a79ca1b
Suggestion from Mark
fwesselm Oct 20, 2025
a9cb877
Merge pull request #2444 from ERGO-Code/strong-branch-refactor
Opt-Mucca Oct 20, 2025
1d292b5
Fix: mark all global constants as static const to avoid multiple defi…
mwelt Oct 20, 2025
b161f68
Merge pull request #2582 from mwelt/fix/static-const-c-api
jajhall Oct 20, 2025
0d28e7a
merge latest
galabovaa Oct 21, 2025
99f278b
typo and test cleanup
galabovaa Oct 21, 2025
d46fc08
more clean up
galabovaa Oct 21, 2025
bcaf3d7
get-fixed-lp test fix
galabovaa Oct 21, 2025
2df2431
Re-introduce getPresolveOrigRowsIndex
fwesselm Oct 21, 2025
ccf0e08
Fix typo
fwesselm Oct 21, 2025
f0f95a5
remove 1.11 ortools patch
galabovaa Oct 22, 2025
556736a
Merge branch 'latest' into fix-2460
jajhall Oct 22, 2025
5d2b67e
Formatted, and made static const char* Highs_compilationDate(void); c…
jajhall Oct 22, 2025
4d4f0b5
Define IDXTYPEWIDTH before metis.h is included
filikat Oct 22, 2025
cac98b9
Merge pull request #2577 from ERGO-Code/fix-2460
jajhall Oct 22, 2025
f2b4b35
Merge pull request #2584 from fwesselm/fixBuild
jajhall Oct 22, 2025
4d47c95
Documentation and clean up
galabovaa Oct 22, 2025
45df09a
Revert "Correct and enhanced handling of `user_cost_scale` and `user_…
jajhall Oct 22, 2025
f86ce19
Merge pull request #2586 from ERGO-Code/revert-2577-fix-2460
jajhall Oct 22, 2025
3a898c8
IPX now used in HighsMipSolverData::startAnalyticCenterComputation
jajhall Oct 22, 2025
f434d3b
Merge branch 'hipo-dev-latest' of https://github.com/ERGO-Code/HiGHS …
jajhall Oct 22, 2025
8908815
Merge branch 'latest' into hipo-dev-latest
galabovaa Oct 22, 2025
9af599a
Added HighsSolution::print with prefix for grep, and added prefix to …
jajhall Oct 22, 2025
469c0ec
Formatted
jajhall Oct 22, 2025
2d57315
Merge pull request #2583 from ERGO-Code/hipo-dev-latest
galabovaa Oct 22, 2025
24994d9
Merge branch 'latest' into ortools-unpatch
galabovaa Oct 22, 2025
6033461
trim
galabovaa Oct 22, 2025
9f8d6b3
Merge branch 'latest' into solution-print
jajhall Oct 23, 2025
98ba6c3
Merge pull request #2588 from ERGO-Code/ortools-unpatch
galabovaa Oct 23, 2025
fb14c23
Updated FEATURES.md and added HighsModel to getIis in highspy
jajhall Oct 23, 2025
5ebc65d
Formatted
jajhall Oct 23, 2025
8443d8b
Corrected highs_bindings.cpp
jajhall Oct 23, 2025
fffce76
fix: Correct configure message for executable
DuPol Oct 23, 2025
cefa4ac
Updated FEATURES.md and docs/src/options/definitions.md to reflect re…
jajhall Oct 23, 2025
b00605e
Merge pull request #2587 from ERGO-Code/solution-print
jajhall Oct 23, 2025
55aab22
Add printing of BLAS path to the log
filikat Oct 23, 2025
5a05487
blas order
galabovaa Oct 23, 2025
f20d21e
merge latest
galabovaa Oct 23, 2025
1e62be5
documentation
galabovaa Oct 23, 2025
dc5729c
Merge pull request #2590 from ERGO-Code/hipo-dev-latest
galabovaa Oct 23, 2025
340a501
Merge branch 'latest' into hipo-dev
galabovaa Oct 23, 2025
58f2871
typo
galabovaa Oct 23, 2025
6fce2a5
Merge pull request #2591 from ERGO-Code/hipo-dev
galabovaa Oct 23, 2025
0b27831
message status
galabovaa Oct 23, 2025
89fdcc8
Merge pull request #2589 from DuPol/patch-1
galabovaa Oct 23, 2025
f429885
Merge pull request #2592 from ERGO-Code/hipo-dev
galabovaa Oct 23, 2025
4d59a83
Update FEATURES.md
galabovaa Oct 23, 2025
daf574a
optional blas added to cmake targets
galabovaa Oct 23, 2025
7de398e
Merged fix-2460 into this branch by hand!
jajhall Oct 23, 2025
397d898
Forgot to rename user_cost_scale to user_objective_scale in highs/hig…
jajhall Oct 23, 2025
448ad6d
Restored reportSubSolverCallTime() call, dependent on options_.log_de…
jajhall Oct 23, 2025
a65e195
Merge pull request #2596 from ERGO-Code/latest-2460
galabovaa Oct 23, 2025
ceee3fa
Metis interface back to normal
filikat Oct 24, 2025
3c25534
Updated docs/src/guide/kkt.md and added qpsolver/README.md and lp_dat…
jajhall Oct 24, 2025
0262fb1
Remove duplicate entry for #2487 in FEATURES.md
BenChampion Oct 24, 2025
c098c87
Merge pull request #2598 from ERGO-Code/hipo-metis-change
galabovaa Oct 24, 2025
feba0a6
Merge pull request #2599 from ERGO-Code/BenChampion-FEATURES-md-2487-…
galabovaa Oct 24, 2025
14eb056
Merge pull request #2597 from ERGO-Code/cmake-blas
galabovaa Oct 24, 2025
6e7ce4d
Updated two minor dev logging cases, updated gup.md and kkt.md, and a…
jajhall Oct 24, 2025
3ef23cf
Removed highs/lp_data/UserScale.md
jajhall Oct 24, 2025
39215fc
add valgrind flow
galabovaa Oct 24, 2025
6b77fc2
corrected @id to @ref in numerics.md
jajhall Oct 24, 2025
7aac7ef
Fixed error in docs/src/options/definitions.md
jajhall Oct 24, 2025
3dab010
add tests for metis debug
galabovaa Oct 24, 2025
0992a90
Merge pull request #2600 from ERGO-Code/latest-docs
jajhall Oct 24, 2025
59bd429
Merge pull request #2602 from ERGO-Code/valgrind-hipo
galabovaa Oct 24, 2025
a268d89
Merge pull request #2575 from fwesselm/predictiveBoundsAnalysisNew2
jajhall Oct 24, 2025
8393022
version bump and build wheels
galabovaa Oct 25, 2025
d033252
python version test
galabovaa Oct 25, 2025
556fada
try testpypi
galabovaa Oct 25, 2025
9c411b9
whitespaces
galabovaa Oct 25, 2025
d4ad5ae
try testpypi 2
galabovaa Oct 25, 2025
1647116
testpi max and win
galabovaa Oct 25, 2025
5bb8857
reset build-wheels after successful testpypi OS checks locally
galabovaa Oct 25, 2025
9fa8db6
Merge pull request #2604 from ERGO-Code/new-v
galabovaa Oct 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
build --enable_platform_specific_config

build:windows --enable_runfiles

build:asan --strip=never
build:asan --copt -fsanitize=address
build:asan --copt -O1
Expand Down
7 changes: 6 additions & 1 deletion .github/julia/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=${BUILD_SHARED} \
-DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
-DFAST_BUILD=ON ..
-DHIPO=ON \
-DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
-DMETIS_ROOT=${prefix} \
..

if [[ "${target}" == *-linux-* ]]; then
make -j ${nproc}
Expand All @@ -60,6 +63,8 @@ platforms = expand_cxxstring_abis(platforms)
dependencies = [
Dependency("CompilerSupportLibraries_jll"),
Dependency("Zlib_jll"),
Dependency("METIS_jll"),
Dependency("OpenBLAS32_jll"),
HostBuildDependency(PackageSpec(; name="CMake_jll")),
]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON

- name: Build
working-directory: ${{runner.workspace}}/build
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON

- name: Build
working-directory: ${{runner.workspace}}/build
Expand Down
33 changes: 15 additions & 18 deletions .github/workflows/build-nuget-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ concurrency:
cancel-in-progress: true

jobs:
# macos 13 is Intel
build_macos_13:
runs-on: macos-13
# strategy:
# matrix:
# python: [3.11]
# Build macos intel
build_macos_intel:
runs-on: macos-15-intel
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
Expand All @@ -31,10 +28,10 @@ jobs:
with:
name: macos-x64
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
# macos 14 is M1
build_macos_14:
runs-on: macos-14

# Build macos arm64
build_macos_arm:
runs-on: macos-14 # macos-14 is arm64
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
Expand All @@ -54,14 +51,14 @@ jobs:
name: macos-arm64
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes

# Build windows 32 and linux
# Build windows 32 and linux
build_windows_32:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- name: Build HiGHS
run: |
cmake -E make_directory ${{runner.workspace}}/build32
cmake -E make_directory ${{runner.workspace}}/build32

- name: Configure CMake win32
shell: bash
Expand Down Expand Up @@ -126,7 +123,7 @@ jobs:

build_windows:
runs-on: windows-latest
needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
needs: [build_macos_intel, build_macos_arm, build_windows_32, build_linux, build_linux_arm64]
steps:
- uses: actions/checkout@v4
- name: Build HiGHS Windows native
Expand All @@ -142,10 +139,10 @@ jobs:
working-directory: ${{runner.workspace}}/build
shell: bash
run: cmake --build . --config Release --parallel

- name: Display structure of downloaded files
run: |
pwd
pwd
ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes

- name: Download runtimes macos-x64
Expand Down Expand Up @@ -187,7 +184,7 @@ jobs:

- name: Dotnet pack
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
run: dotnet pack -c Release /p:Version=1.11.0
run: dotnet pack -c Release /p:Version=1.12.0

- uses: actions/upload-artifact@v4
with:
Expand All @@ -201,7 +198,7 @@ jobs:
name: nuget

if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
steps:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4

Expand All @@ -211,6 +208,6 @@ jobs:
name: nuget

- name: Dotnet push
run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 4 additions & 6 deletions .github/workflows/build-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,8 @@ jobs:
python3 -m pip install pytest
python3 -m pytest $GITHUB_WORKSPACE

# macos 13 is Intel
build_wheel_macos_13:
runs-on: macos-13
build_wheel_macos_intel:
runs-on: macos-15-intel
strategy:
matrix:
python: [3.11]
Expand Down Expand Up @@ -163,9 +162,8 @@ jobs:
python3 -m pip install pytest
python3 -m pytest $GITHUB_WORKSPACE

# macos 14 is M1
build_wheel_macos_14:
runs-on: macos-14
build_wheel_macos_arm:
runs-on: macos-14 # macos-14 is arm64
strategy:
matrix:
python: [3.11]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
- [ubuntu-24.04, musllinux_i686]
- [ubuntu-24.04-arm, musllinux_aarch64]
- [macos-13, macosx_x86_64]
- [macos-15-intel, macosx_x86_64]
- [macos-14, macosx_arm64]
- [windows-2022, win_amd64]
- [windows-2022, win32]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: build-wheels

on: [push]
# on: [pull_request]
# on: [push]
on: [pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
- [ubuntu-24.04, musllinux_i686]
- [ubuntu-24.04-arm, musllinux_aarch64]
- [macos-13, macosx_x86_64]
- [macos-15-intel, macosx_x86_64]
- [macos-14, macosx_arm64]
- [windows-2022, win_amd64]
- [windows-2022, win32]
Expand Down
Loading
Loading