Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest for release #1651

Merged
merged 609 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
609 commits
Select commit Hold shift + click to select a range
d277345
BLD: Fix the libatomic handling
HaoZeke Feb 4, 2024
e8edffc
Merge pull request #1605 from HaoZeke/atomic32bit
jajhall Feb 4, 2024
338306c
Added (failing) tests to TestPdlp.cpp using infeasible and unbounded LPs
jajhall Feb 5, 2024
c49b036
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into noCo…
fwesselm Feb 5, 2024
52e9bc9
Now computing primal/dual infeasibilities for columns
jajhall Feb 5, 2024
9f6e2ba
Now computing infeasibilities in pdlpSolutionToHighsSolution
jajhall Feb 5, 2024
ed265ab
PDLP now using option va;lues from HiGHS
jajhall Feb 5, 2024
d5417aa
Deleted call to getUserParam
jajhall Feb 5, 2024
94555a3
Removed reference to sys/time.h unless CUPDLP_TIMER is defined
jajhall Feb 5, 2024
2a0c22f
Merged latest into this branch and resolved conflicts
jajhall Feb 5, 2024
6317b92
Now using onst HighsInt *A_csc_beg/idx
jajhall Feb 5, 2024
66b5454
Updated to cuPDLP-main
jajhall Feb 5, 2024
7b1b3da
Integrated cuPDLP-C main
jajhall Feb 5, 2024
563b386
Merged add-pdlp-main into this branch and restored README.md
jajhall Feb 5, 2024
3d0d981
pdlp-unbounded-lp and pdlp-infeasible-lp both pass
jajhall Feb 5, 2024
44c812e
Allowing kUnboundedOrInfeasible from PDLP
jajhall Feb 5, 2024
ab50423
Updated TestPdlp.cpp and README.md
jajhall Feb 5, 2024
2df5039
Returning iteration count from cuPDLP-c
jajhall Feb 6, 2024
51ea6b5
Updated README.md
jajhall Feb 6, 2024
1c08143
clean up python sdist, add numpy as dependency
galabovaa Feb 6, 2024
3f52b43
clean up setup.py
galabovaa Feb 6, 2024
4c67cca
Merge pull request #1574 from ERGO-Code/fix-1560
jajhall Feb 6, 2024
1ee5014
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into noCo…
fwesselm Feb 7, 2024
b24502a
Remove new flag
fwesselm Feb 7, 2024
5a807a2
Vector pointers now const in dot/Dotprod/Dotprod_Neumaier
jajhall Feb 7, 2024
b1ef406
Replaced CUPDLP_INIT_ZERO_VEC by CUPDLP_INIT_ZERO_INT/DOUBLE_VEC in c…
jajhall Feb 7, 2024
4167725
Replaced CUPDLP_INIT_ZERO_VEC by CUPDLP_INIT_ZERO_INT/DOUBLE_VEC in m…
jajhall Feb 7, 2024
9ac66f9
Update README.md
jajhall Feb 7, 2024
054299f
Introduced TestTspSolver.cpp to study cuts and test lazy constraints
jajhall Feb 7, 2024
4060a62
Now extracting cut pool via callback
jajhall Feb 7, 2024
06da247
Created this branch
jajhall Feb 8, 2024
5306267
Silenced unit tests
jajhall Feb 8, 2024
ab060dc
Merge pull request #1609 from ERGO-Code/get-cutpool-callback
jajhall Feb 8, 2024
aca73b7
vs added to gitignore
galabovaa Feb 9, 2024
8099904
csharp revisit
galabovaa Feb 9, 2024
27d0d46
temp old syntax cmake
galabovaa Feb 9, 2024
5b18290
temp old syntax cmake
galabovaa Feb 9, 2024
f15ee82
temp old syntax cmake
galabovaa Feb 9, 2024
045c783
path to csharp exe
galabovaa Feb 9, 2024
bce85c8
ls
galabovaa Feb 9, 2024
19b5972
Merge branch 'master' into csharp
galabovaa Feb 9, 2024
d6caf8a
typo
galabovaa Feb 9, 2024
692a574
Merge pull request #1611 from ERGO-Code/csharp
galabovaa Feb 9, 2024
67dc916
Is cupdlp_mps needed?
jajhall Feb 9, 2024
15d8d1b
Removed cupdlp_mps*
jajhall Feb 9, 2024
b2b922b
Replaced most of macros
jajhall Feb 9, 2024
5c03df6
Replaced all macros using typeof
jajhall Feb 9, 2024
0bfce17
Commented out TestPdlp methods
jajhall Feb 9, 2024
1ab551a
Merge branch 'latest' into add-pdlp
jajhall Feb 9, 2024
15c0ed1
Add /src/pdlp/ ro highs-formatDIR
jajhall Feb 10, 2024
40603c5
Added /src/pdlp/ ro highs-formatDIR
jajhall Feb 10, 2024
03a8861
Corrected overflow in setting intParam[N_ITER_LIM] with HIGHSINT64=on
jajhall Feb 10, 2024
2086974
Now interpreting pdlp_model_status == TIMELIMIT_OR_ITERLIMIT
jajhall Feb 10, 2024
800309c
Added comment on setting intParam[N_ITER_LIM]
jajhall Feb 10, 2024
61ed5df
Added public int PdlpIterationCount to highs_csharp_api.cs
jajhall Feb 10, 2024
3fc0ed9
Investigating NAN issue in MPS fead
jajhall Feb 10, 2024
1d80d50
Formatted
jajhall Feb 10, 2024
7f6d5b2
Now using HMpsFF::isNan
jajhall Feb 10, 2024
72426d9
Removed nan check and test
jajhall Feb 10, 2024
62fb5c3
Removed conf_data.set('CUPDLP_CPU', cupdlp_cpu.found()) from meson.build
jajhall Feb 10, 2024
ecec18f
Added src/pdlp/*.cpp and src/pdlp/cupdlp/*.c to BUILD.bazel
jajhall Feb 10, 2024
71596db
Added pdlp/CupdlpWrapper.cpp to highslib_srcs in meson.build
jajhall Feb 10, 2024
ebf8d8e
Cleaned up HMpsFF.cpp
jajhall Feb 10, 2024
f7fea5b
Introduced IntParam[N_LOG_INTERVAL]
jajhall Feb 10, 2024
5a7d90d
Maybe delete cupdlp_scaling_cuda
jajhall Feb 10, 2024
04cc0e2
Added log_level to PDHG_Scale_Data_cuda and Init_Scaling
jajhall Feb 10, 2024
ac504be
cuPDLP-C now is less chatty
jajhall Feb 10, 2024
48e2ecd
Merge pull request #1613 from ERGO-Code/add-pdlp
jajhall Feb 10, 2024
fcb6c89
Now reporting how PDLP optimality is overruled due to HiGHS using abs…
jajhall Feb 12, 2024
27673f1
Added complementarity violation calculation to getKktFailures
jajhall Feb 12, 2024
2bf8975
Now understand the difference between primal/dual feasibility for HiG…
jajhall Feb 12, 2024
bbe760f
Formatted
jajhall Feb 12, 2024
c2ba05a
Introduced iInfNormAbsLocalTermination to cuPDLP-C to ensure HiGHS pr…
jajhall Feb 13, 2024
f0b2064
Added HiGHS option to use native PDLP termination
jajhall Feb 13, 2024
7f5f226
Updated cupdlp/README.md and cleaned up some unnecessary mods relativ…
jajhall Feb 13, 2024
feb57a4
Fixed memory access violation in PDHG_Compute_Dual_Feasibility
jajhall Feb 13, 2024
418e7fe
Eliminated commented out CUPDLP_INIT_ZERO_VEC and created Diff Meld M…
jajhall Feb 13, 2024
f99ffdb
Update README.md
jajhall Feb 14, 2024
983cf27
Investigating unit test failure
jajhall Feb 15, 2024
34c32e9
Changed type of kHighsIInf32 from int to HighsInt
jajhall Feb 15, 2024
4db3d37
Inserted more debugging code to see why iter limit isn't respected
jajhall Feb 15, 2024
4270232
Inserted further debugging code to see why iter limit isn't respected
jajhall Feb 15, 2024
d549121
Inserted even ore debugging code to see why iter limit isn't respected
jajhall Feb 15, 2024
9e51a47
Fix postsolve for problems reduced to empty by presolve
fwesselm Feb 15, 2024
da922af
Remove unnecessary line
fwesselm Feb 15, 2024
11f338b
Narrowing down on where intParam[N_ITER_LIM] is corrupted
jajhall Feb 15, 2024
28f288b
Removed unnecessary printing
jajhall Feb 15, 2024
63c3829
Add test for empty problems after presolve
fwesselm Feb 16, 2024
13c697e
Merge branch 'testReducedEmpty' of https://github.com/fwesselm/HiGHS …
fwesselm Feb 16, 2024
670f12d
Added auto dD2e = [&](std::string& word) to HMpsFF::getValue to read …
jajhall Feb 16, 2024
896e18b
Added ../check/instances/dD2e.mps
jajhall Feb 16, 2024
1ff1ad2
Merge pull request #1619 from fwesselm/emptyAfterPresolve
jajhall Feb 16, 2024
943cc2f
Merge branch 'latest' into fix-1618
jajhall Feb 16, 2024
a627d7f
Eliminated the dependency on setting valid in Highs::postsolve
jajhall Feb 16, 2024
bfe27ee
Merge pull request #1621 from ERGO-Code/fix-1618
jajhall Feb 16, 2024
e6f6776
Merge pull request #1622 from ERGO-Code/fix-1620
jajhall Feb 16, 2024
e98e5cc
Merge branch 'latest' into add-pdlp
jajhall Feb 16, 2024
1fa395f
Now setting N_INT_USER_PARAM and N_FLOAT_USER_PARAM via enum rather t…
jajhall Feb 16, 2024
0341586
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into noCo…
fwesselm Feb 16, 2024
546265f
Removed debug printing and silenced unit test; formatted
jajhall Feb 16, 2024
b49188f
Merge pull request #1623 from ERGO-Code/add-pdlp
jajhall Feb 16, 2024
196ca8f
Now checking for null pivotal row index, rather than foundPivot
jajhall Feb 19, 2024
2c9e21d
Update bazel version and move with other config files
Coloquinte Feb 19, 2024
9df193f
Include Windows version in the DLL
Coloquinte Feb 19, 2024
4aa082e
Merge pull request #1627 from Coloquinte/windows_version
jajhall Feb 19, 2024
3d8163b
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into noCo…
fwesselm Feb 22, 2024
19b605f
Merged latest into this branch and now using time.h in cuPDLP-C
jajhall Feb 22, 2024
d532a3a
Logging header repeated every 50 lines
jajhall Feb 22, 2024
95e8f68
Merge branch 'latest' into ppy-clean
galabovaa Feb 22, 2024
d0a72b5
merge latest and cleanup
galabovaa Feb 22, 2024
7113b93
Merge branch 'add-pdlp' into ppy-clean
galabovaa Feb 22, 2024
d0222d3
default constructor for highs_options
galabovaa Feb 22, 2024
036574f
clean up
galabovaa Feb 22, 2024
5a5287e
Merge pull request #1632 from ERGO-Code/add-pdlp
galabovaa Feb 22, 2024
9b5bf81
cupdlp sources added
galabovaa Feb 22, 2024
3481b70
cupdlp files cmake
galabovaa Feb 22, 2024
f3734d8
more sources
galabovaa Feb 22, 2024
c623fef
version, csharp shared lib, disable modelling tests
galabovaa Feb 22, 2024
0fe46f5
timeofday removed
galabovaa Feb 22, 2024
a4f56eb
test exe
galabovaa Feb 22, 2024
78fa827
use clock() on windows
galabovaa Feb 22, 2024
1a69380
highs build rpath
galabovaa Feb 22, 2024
31d7767
win path to exe
galabovaa Feb 22, 2024
90ff3fd
cmake clean up
galabovaa Feb 22, 2024
5d4fd2e
rpath interfaces
galabovaa Feb 22, 2024
3b8ab26
exe workflow edit
galabovaa Feb 22, 2024
fc82642
cibw
galabovaa Feb 22, 2024
23df347
Merge branch 'ppy-clean' of https://github.com/ERGO-Code/HiGHS into p…
galabovaa Feb 22, 2024
fcde26a
exe ubuntu:
galabovaa Feb 22, 2024
47da273
fixes cmake and python after refactor
galabovaa Feb 22, 2024
2cfd5da
added fortran test
galabovaa Feb 22, 2024
a84004f
unix test rw basis
galabovaa Feb 22, 2024
0031486
wflow matrix
galabovaa Feb 22, 2024
5299278
fortran test
galabovaa Feb 22, 2024
23437a2
fortran path to test
galabovaa Feb 22, 2024
b418b46
win compiler warnings
galabovaa Feb 22, 2024
cb5173d
accidental paste in check/
galabovaa Feb 22, 2024
7d2d24f
fortran test back to check/CMakeLists
galabovaa Feb 22, 2024
9d36816
save
galabovaa Feb 22, 2024
2895779
remove duplicate
galabovaa Feb 22, 2024
6b5e5ef
fix include order mistake
galabovaa Feb 22, 2024
75d53d4
fortran test and limit windows warnings
galabovaa Feb 22, 2024
7ba457e
compiler options unix
galabovaa Feb 23, 2024
e405f07
shared libs on for csharp interface
galabovaa Feb 23, 2024
7595fb1
csharp and fortran try with build rpath
galabovaa Feb 23, 2024
27a2eb5
basiclu sources wIP
galabovaa Feb 23, 2024
600843a
ipx sources wIP
galabovaa Feb 23, 2024
d8bfe87
highs sources wIP
galabovaa Feb 23, 2024
7a5f558
zlib off for python
galabovaa Feb 23, 2024
df795a6
typo
galabovaa Feb 23, 2024
b3429c5
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into noCo…
fwesselm Feb 26, 2024
b03b6e4
Clean up
fwesselm Feb 26, 2024
5430bde
Merge pull request #1637 from fwesselm/addUnscaleSolution
jajhall Feb 26, 2024
2b18e62
wip
galabovaa Feb 26, 2024
c393432
sources cmake compiling by default
galabovaa Feb 27, 2024
a0831a7
Created Highs::getPresolveOrigRowsIndex and Highs::getPresolveOrigRow…
jajhall Feb 27, 2024
9bf901e
OK locally on win
galabovaa Feb 27, 2024
c4d85ea
Merge branch 'latest' into rel18-clean
galabovaa Feb 27, 2024
f23b54f
wip
galabovaa Feb 27, 2024
6480368
Added primal value unit test to presolve-solve-postsolve-lp
jajhall Feb 27, 2024
57d71e8
installing headers@
galabovaa Feb 27, 2024
e9b8695
headers include
galabovaa Feb 27, 2024
3dbf800
Merge pull request #1640 from ERGO-Code/fix-1638
jajhall Feb 27, 2024
14dea9c
cmake targets file with project namespace
galabovaa Feb 27, 2024
9dfae3a
Now reading inf, +inf and -inf in options file
jajhall Feb 27, 2024
fc9b334
Added ../check/instances/WithInf.set
jajhall Feb 27, 2024
4fad3dc
Merge pull request #1642 from ERGO-Code/fix-1631
jajhall Feb 27, 2024
6c9d49e
highs_headers
galabovaa Feb 28, 2024
6cbbec1
Added documentation on logging from highspy
jajhall Feb 28, 2024
6d164ea
fix compile error in deprecated method in c api
galabovaa Feb 28, 2024
911fcfb
Introduced HiGHS logging parameters into IPX parameters
jajhall Feb 28, 2024
4955e8a
Now with highs_logging and HighsLogOptions in ipx_parameters
jajhall Feb 28, 2024
6177030
Introduced hLoggingStream to set up std::stringstream and Control::hL…
jajhall Feb 28, 2024
dee37ec
Now setting h_logging_stream.str(std::string()); and not using Contro…
jajhall Feb 28, 2024
7e71a4e
Not using control_.hLog
jajhall Feb 28, 2024
1f4faa5
Now using const HighsLogOptions* log_options; in struct ipx_parameters
jajhall Feb 29, 2024
bb90eab
Now trying to use highsLogUser
jajhall Feb 29, 2024
d53fa2f
Now setting parameters.highs_logging = true; and parameters.log_optio…
jajhall Feb 29, 2024
5af72b5
Looking at new segfault
jajhall Feb 29, 2024
0a92887
Now we see that struct ipx_parameters ipx_default_parameters() isn't …
jajhall Feb 29, 2024
b0cce6a
Now trying Control::hLog(std::stringstream& logging)
jajhall Feb 29, 2024
ad4c4e2
Replaced all uses of std::ostream& Control::Log() by Control::hLog
jajhall Feb 29, 2024
e04c292
Removed Control::IntervalLog()
jajhall Feb 29, 2024
d7a1294
Restored parameters.highs_logging = true; in IpxWrapper.cpp
jajhall Feb 29, 2024
e305292
Merge pull request #1646 from ERGO-Code/fix-1644-ok
jajhall Mar 1, 2024
e6e8110
Added comment on callback access from highspy
jajhall Mar 1, 2024
2eab602
Fixed long-standing bug in Highs::getCols and Highs::getRows
jajhall Mar 1, 2024
7150981
removed deprecated method from test file and csharp api
galabovaa Mar 2, 2024
8b590d8
removed deprecated method from test file and csharp api
galabovaa Mar 2, 2024
229a85c
commented out test of deprecated method
galabovaa Mar 2, 2024
0127799
change back csharp api method
galabovaa Mar 2, 2024
26d365f
fix path to c api header
galabovaa Mar 2, 2024
7d78152
c example fix includes
galabovaa Mar 2, 2024
0dd2ff4
zd
galabovaa Mar 2, 2024
fbbcaa2
works with cmake find project
galabovaa Mar 2, 2024
e1cf917
paths for fetch content
galabovaa Mar 2, 2024
694ae33
zstr
galabovaa Mar 2, 2024
7231144
typo in header
galabovaa Mar 2, 2024
2ccc257
pdqsort includes
galabovaa Mar 2, 2024
5130b8c
formatting
galabovaa Mar 2, 2024
7721555
try to split large pdb files into smaller ones
galabovaa Mar 2, 2024
8f477fc
Merge pull request #1641 from ERGO-Code/rel18-clean
galabovaa Mar 4, 2024
c295dcf
version down to testpypi
galabovaa Mar 4, 2024
f28979a
cleanup and new workflow
galabovaa Mar 4, 2024
06436f9
test
galabovaa Mar 4, 2024
a83b951
build sdist
galabovaa Mar 4, 2024
f514c63
test wheel install
galabovaa Mar 4, 2024
1bd4d13
tests added for macos and windows
galabovaa Mar 4, 2024
41fc856
wip tests
galabovaa Mar 4, 2024
4b97cdf
remove invalid classifier for licence
galabovaa Mar 4, 2024
61b482e
item.name win sdist
galabovaa Mar 4, 2024
1e349f5
typo
galabovaa Mar 4, 2024
8dc1a73
removed .name
galabovaa Mar 4, 2024
1e7559a
added many macos and moved numpy to extras require
galabovaa Mar 4, 2024
b10832d
windows path and macos runners
galabovaa Mar 4, 2024
f789ca5
typo
galabovaa Mar 4, 2024
8912971
numpy back to install requirements
galabovaa Mar 4, 2024
ce11843
numpy back to install
galabovaa Mar 4, 2024
0744329
test windows wheel
galabovaa Mar 4, 2024
8922d5a
win arm64
galabovaa Mar 4, 2024
6971386
numpy requires
galabovaa Mar 4, 2024
d9472d1
cibw build *
galabovaa Mar 4, 2024
5e7b64e
wip failing tests
galabovaa Mar 4, 2024
0b96f30
wip
galabovaa Mar 4, 2024
ef8be04
python versions and win working dir
galabovaa Mar 4, 2024
03206f8
working dir
galabovaa Mar 4, 2024
013b1f8
working dir path
galabovaa Mar 4, 2024
a17d2c4
working dir path ls
galabovaa Mar 4, 2024
edc2666
path 1
galabovaa Mar 4, 2024
fac840e
path 2
galabovaa Mar 4, 2024
2482d98
python versions
galabovaa Mar 4, 2024
d44d07f
path and python setup
galabovaa Mar 4, 2024
331ec00
python versions and architectures
galabovaa Mar 4, 2024
a0bff81
paths again
galabovaa Mar 4, 2024
96db5c5
tests to build python packages
galabovaa Mar 4, 2024
7faad7a
python requires
galabovaa Mar 4, 2024
8c866f0
action version and more python examples and tests
galabovaa Mar 4, 2024
53b8670
macos m1 macos-14 runner
galabovaa Mar 4, 2024
89c96b7
win arm does not seem to be supported
galabovaa Mar 4, 2024
1bbecf6
readme and examples
galabovaa Mar 5, 2024
df4c5b6
style
galabovaa Mar 5, 2024
a9bfcd4
wheel push on tagged release on
galabovaa Mar 5, 2024
8dd8b72
print format
galabovaa Mar 5, 2024
f503b60
readme cleanup and python example fix
galabovaa Mar 5, 2024
f78bc6f
pr clean up
galabovaa Mar 5, 2024
6652618
versions
galabovaa Mar 5, 2024
ee3ef6c
version ready for tag
galabovaa Mar 5, 2024
2b56562
Merge pull request #1649 from ERGO-Code/testpi
galabovaa Mar 5, 2024
cbb8c65
python package tests on PR, not push
galabovaa Mar 6, 2024
8dd3fbb
Update README.md
jajhall Mar 6, 2024
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build-bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
os: [macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: bazelbuild/setup-bazelisk@v2

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -34,7 +34,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
run: ctest --parallel 2 --timeout 300 --output-on-failure

release:
runs-on: ${{ matrix.os }}
Expand All @@ -43,7 +43,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -100,7 +100,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
run: ctest --parallel 2 --timeout 300 --output-on-failure

release64:
runs-on: ${{ matrix.os }}
Expand All @@ -109,7 +109,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down
25 changes: 5 additions & 20 deletions .github/workflows/build-fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ jobs:
os: [macOS-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake -DFAST_BUILD=ON -DEXP=ON $GITHUB_WORKSPACE
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE

- name: Build
working-directory: ${{runner.workspace}}/build
Expand All @@ -29,21 +28,7 @@ jobs:
- name: Test
working-directory: ${{runner.workspace}}/build
shell: bash
run: ctest

# disable for now, py11 changes broke it. something trivial but
# not necessary, that was proof of concept. leaving here for now.
# - name: Doctest
# working-directory: ${{runner.workspace}}/build
# shell: bash
# run: ./bin/doctest

- name: Install
run: |
cmake -E make_directory ${{runner.workspace}}/install \
cmake -DFAST_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install $GITHUB_WORKSPACE \
cmake --build . --parallel \
cmake --install . \
run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE

fast-build-debug:
runs-on: ${{ matrix.os }}
Expand All @@ -52,7 +37,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -66,7 +51,7 @@ jobs:
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build . --parallel --config DEBUG
run: cmake --build . --parallel

- name: Test
working-directory: ${{runner.workspace}}/build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -32,7 +32,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
run: ctest --parallel 2 --timeout 300 --output-on-failure

release:
runs-on: ${{ matrix.os }}
Expand All @@ -41,7 +41,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: build-macos

on: [pull_request]
on: [push, pull_request]

jobs:
debug:
Expand All @@ -10,7 +10,7 @@ jobs:
os: [macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -32,7 +32,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --parallel 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
run: ctest --parallel 2 --timeout 300 --output-on-failure

release:
runs-on: ${{ matrix.os }}
Expand All @@ -41,7 +41,7 @@ jobs:
os: [macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
os: [macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
os: [macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/build-meson.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Meson Builds with Conda
name: build-meson
on: [push, pull_request]

jobs:
Expand All @@ -8,7 +8,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest] # windows-latest takes to long
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"
fetch-depth: 0
Expand All @@ -33,11 +33,15 @@ jobs:
run: |
meson setup bbdir -Duse_zlib=enabled -Dwith_tests=True
meson test -C bbdir
- name: Test compiled highspy
shell: bash -l {0}
run: |
meson configure bbdir -Dwith_pybind11=True
meson compile -C bbdir
LD_LIBRARY_PATH=$(pwd)/bbdir/src \
PYTHONPATH=$(pwd)/bbdir \
python examples/call_highs_from_python.py

# highspy no longer compiled with meson, back to
# setuptools and CMakeBuild
# todo: use it optionally in some way
# - name: Test compiled highspy
# shell: bash -l {0}
# run: |
# meson configure bbdir -Dwith_pybind11=True
# meson compile -C bbdir
# LD_LIBRARY_PATH=$(pwd)/bbdir/src \
# PYTHONPATH=$(pwd)/bbdir \
# python examples/call_highs_from_python.py
5 changes: 3 additions & 2 deletions .github/workflows/build-mingw.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: build-mingw

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

jobs:
Expand Down Expand Up @@ -41,12 +42,12 @@ jobs:
${{ matrix.target-prefix }}-cc
${{ matrix.target-prefix }}-ninja

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Configure CMake
run: |
mkdir build && cd build
cmake .. -DFAST_BUILD=${{ matrix.fast-build }} -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DHIGHSINT64=${{ matrix.int64 }}
cmake .. -DFAST_BUILD=${{ matrix.fast-build }} -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DHIGHSINT64=${{ matrix.int64 }} -DHIGHS_NO_DEFAULT_THREADS=ON

- name: Build
# Execute the build. You can specify a specific target with "--target <NAME>"
Expand Down
Loading