Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
6d54c4b
CMake better handling of symlink when installing 3rd-party lib #469
cyrilbouvier Nov 3, 2020
64a3ff6
Revert "CMake better handling of symlink when installing 3rd-party li…
cyrilbouvier Dec 2, 2020
5ae5905
Second attempt at fixing symlink from 3rd-party lib #469
cyrilbouvier Dec 2, 2020
de06a43
Remove dependency to affine plugin in OptimizerO4Config
gchabert Dec 4, 2020
0213b67
Cmake: improve tests scripts + allow some scripts to be shared with p…
cyrilbouvier Dec 9, 2020
5e9a89c
CMake: large rewriting of how dependencies are handled. Need to updat…
cyrilbouvier Dec 16, 2020
f358cdb
Update wscript (for dependency management)
gchabert Dec 10, 2020
66b5922
CMake: fix setting version in FindGaol and FindMathlib script
cyrilbouvier Dec 16, 2020
163d140
Clp: first version of CMake script + wrapper file from raphaelchenoua…
cyrilbouvier Dec 17, 2020
e62c84c
CMake: improve FindClp
cyrilbouvier Dec 17, 2020
8de0af1
Update ibex_LPLibWrapper.cpp
raphaelchenouard Dec 17, 2020
e5ef966
CMake: first step towards automatic installation of Clp (WIP)
cyrilbouvier Dec 17, 2020
e6a43ab
CMake: let Gaol install itself on OSX 64bits
cyrilbouvier Dec 17, 2020
dd1f18d
CMake: CMAKE_SYSTEM for OSX is Darwin not DARWIN
cyrilbouvier Dec 17, 2020
f7da99a
CMake: update FindClp.cmake script
cyrilbouvier Dec 18, 2020
d086444
Fix waf
cyrilbouvier Dec 18, 2020
bfefc92
CMake: In gaol script, put sse and math-rounding flags in interface
cyrilbouvier Dec 18, 2020
30277bc
CI: trying to fix travis on OSX
cyrilbouvier Dec 18, 2020
aa1d152
CI: trying to fix travis on OSX (2)
cyrilbouvier Dec 18, 2020
2a005c9
CI: trying to fix travis on OSX (3)
cyrilbouvier Dec 18, 2020
a447aa7
CI: trying to fix travis on OSX (4)
cyrilbouvier Dec 18, 2020
a6cce7b
CMake: temporary fix for Debug mode #492
cyrilbouvier Dec 19, 2020
b23c013
various modifications to make clp wrapper compile, but there is now a…
raphaelchenouard Dec 18, 2020
b887367
CMake: fix typo in installation directory of soplex library
cyrilbouvier Jan 4, 2021
839ff88
fix about unbounded constraints and clear_constraints.
raphaelchenouard Dec 21, 2020
a89500e
doc update: ibexsolve (in progress)
gchabert Dec 21, 2020
cb76dae
doc update: ibexsolve (ok). + Change in solver strategy when m=0
gchabert Dec 22, 2020
8350d1e
doc update: ibexsolve (minor)
gchabert Dec 22, 2020
ab0bc25
Doc update
gchabert Dec 22, 2020
5613520
Doc update
gchabert Dec 22, 2020
9a5864c
Doc update (mainly ibexopt)
gchabert Dec 22, 2020
d9f9c0b
Doc update (mainly ibexopt)
gchabert Dec 22, 2020
001f3ab
optim: fix bug in rigor mode (was using subset of constraints for lou…
gchabert Dec 29, 2020
84eff11
doc update
gchabert Dec 29, 2020
9d1772f
Doc update after #411
gchabert Jan 3, 2021
05f5578
Doc update
gchabert Jan 3, 2021
87aa436
fix bug in clp wrapper due to a copy/paste...
raphaelchenouard Jan 4, 2021
6313110
Adding several basic LPSolver tests.
raphaelchenouard Jan 4, 2021
d8ebbd2
CMake: trying to fix ibex.pc
cyrilbouvier Jan 4, 2021
fa6b72c
CMake: putting Java plugin into core (TODO: add Java tests)
cyrilbouvier Jan 5, 2021
a2e585d
Add several fixes in clp wrapper (col and row methods) and add additi…
raphaelchenouard Jan 5, 2021
47cc6ea
Fix #485
gchabert Jan 5, 2021
4aef914
CMake: fix soplex compilation when Ibex is compiled as shared lib #466
cyrilbouvier Jan 6, 2021
751dfa0
CMake: update script for examples
cyrilbouvier Jan 7, 2021
10f2cf8
correcting ackley examples
bneveu Jan 8, 2021
803dcc2
ignoring cov files
bneveu Jan 8, 2021
65ac7a2
optim: remove old IBEX_AMPL macro and add load_sys(...) function in O…
gchabert Jan 10, 2021
fe4877a
arithmetic: add operator[] with bitsets for Vector/Matrix
gchabert Jan 18, 2021
5dda63e
CMake: first step towards automatic install of Clp (WIP) #368 #489
cyrilbouvier Jan 11, 2021
19f758c
Fix Paths in TestLPSolver.h
cyrilbouvier Jan 11, 2021
7107e9f
CMake: finish automatic installation of Clp #368 #489
cyrilbouvier Jan 12, 2021
e9af40f
add name of function and constraints in SystemFactory
Jordan08 Jan 14, 2021
17d3b5a
LoupFinderXTaylor: apply simple postprocessing to enforce bound const…
gchabert Jan 20, 2021
26b1b75
Fix attempt for CLP wrapper
gchabert Jan 31, 2021
d68cfaf
Undoing last commit
gchabert Feb 1, 2021
6d20e81
correcting OptimLargestFirst bisector
bneveu Apr 9, 2021
4a7fa02
Fix bug in System::minibex()
gchabert Feb 6, 2021
2d65e73
ibexsolve: fix #502
gchabert Feb 16, 2021
f44738b
Try fixing issues with hyperbolic trigo functions (gaol)
gchabert Mar 30, 2021
296998a
Mise à jour références (roadef 21)
trombettoni Mar 23, 2021
77a8ecf
Mise à jour références (roadef 21)
trombettoni Mar 24, 2021
f5c66ba
Fix regex to look for version (replace \. with [.])
cyrilbouvier Mar 25, 2021
5641d03
Try fixing issues with hyperbolic trigo functions (cont'd)
gchabert Apr 2, 2021
f16d5af
Add no-split option to ibexopt and ibexsolve. Fix some minor stuff in…
gchabert Apr 5, 2021
5139b55
adding benchmark for MINLP problems
bneveu Apr 15, 2021
df01088
doc update
gchabert Apr 19, 2021
6821ae5
correction bug in TestSolver
bneveu Nov 29, 2023
19efa04
adding #include <limits> in ibex_arctanhc.h and ibex_arctanhccc.h fo…
bneveu Jan 11, 2024
18657ba
Add FindIpOpt module for CMake compilation
cyrilbouvier Mar 6, 2024
0ada0af
cmake: make looking for IpOpt less verbose
cyrilbouvier Mar 7, 2024
c55802f
Add macro for IPOPT in ibex_Setting.h
cyrilbouvier Mar 12, 2024
c423ff1
Fix typo in CMake script
cyrilbouvier Mar 12, 2024
1af83fc
Add workflow for Ibex CI
cyrilbouvier Mar 15, 2024
ce93c94
Add dependencies install in github workflow
cyrilbouvier Mar 15, 2024
79b596a
CI: forgot sudo
cyrilbouvier Mar 15, 2024
42fe724
CI: forgot a $
cyrilbouvier Mar 15, 2024
adb0c2c
CI: fix working directory problem
cyrilbouvier Mar 15, 2024
7d322d9
CI: now run on runner host at LIRMM
cyrilbouvier Mar 18, 2024
550bc0f
CI: add container for workflow on self-hosted runner
cyrilbouvier Mar 18, 2024
78faea7
CI: remove sudo in ubuntu container
cyrilbouvier Mar 18, 2024
c720422
CI: forgot to install CMake
cyrilbouvier Mar 18, 2024
18da10a
CI: forgot to install g++ and gcc
cyrilbouvier Mar 18, 2024
26209e7
CI: patch is also needed
cyrilbouvier Mar 18, 2024
89dae6e
Issue #546: add test case
gchabert Feb 5, 2025
da016b3
Issue #546: fix
gchabert Feb 5, 2025
e308e42
Fix #548
gchabert Feb 8, 2025
0f5a2fa
Fix #550
gchabert Feb 9, 2025
6ada68e
Comment assertion checking boundedness in Soplex wrapper (add_constra…
gchabert Feb 9, 2025
b00c392
Fix bug in DefaultOptimizer constructor (eps_x)
gchabert Feb 9, 2025
45ce950
Add missing include
gchabert Feb 10, 2025
7451201
Fix missing parenthesis in Filib wrapper (minor)
gchabert Feb 10, 2025
8527d99
Fix warning problems
gchabert Feb 10, 2025
317f08f
Fix warning problems (gaol)
gchabert Feb 10, 2025
2678cfd
Fix LPSolver test failing with Filib
gchabert Feb 10, 2025
41c4447
Fix warning problems (update for Visual studio)
gchabert Feb 10, 2025
ea5f154
Fix warning problems (update for Visual studio), try #2
gchabert Feb 10, 2025
5003307
Fix warning problems (update for Visual studio), try #3
gchabert Feb 10, 2025
4d780f2
Add statistics (fix #440)
gchabert Feb 13, 2025
b165604
Add statistics (fix #440, cont'd)
gchabert Feb 13, 2025
cb6c586
Add statistics (fix #440, add Bsc+Buffer)
gchabert Feb 14, 2025
9397269
uint --> unsigned int
gchabert Feb 16, 2025
4e2e874
Fix variable-size array
gchabert Feb 16, 2025
34424b8
it++ --> ++it
gchabert Feb 23, 2025
f9df39d
Remove Optimizer04Config
gchabert Feb 23, 2025
76ba3f7
Removing all WAF scripts
gchabert Feb 12, 2025
886e316
Change release number to 2.9.0
gchabert Feb 12, 2025
8b84295
Doc update
gchabert Feb 12, 2025
1206489
Remove python scripts 3rd/ (waf)
gchabert Feb 12, 2025
37dd68d
Update message in ibexopt (minor)
gchabert Feb 12, 2025
6a571f6
Doc update
gchabert Feb 12, 2025
0006909
Doc update
gchabert Feb 14, 2025
8612354
Doc update
gchabert Feb 14, 2025
1048aeb
Doc update (windows install)
gchabert Feb 16, 2025
64216dd
Appveyor: build Java interface
gchabert Feb 23, 2025
0682694
Minor doc typo
gchabert Feb 23, 2025
b73044f
Github actions: add MacOS in tests
gchabert Feb 23, 2025
b407d95
CI: fix checksum for self hosted tests + separate macOS tests
cyrilbouvier Feb 24, 2025
989b8d5
CI: add apt command for java packages
cyrilbouvier Feb 24, 2025
826745b
Update mathlib version from 2.1.0 to 2.1.1
cyrilbouvier Feb 26, 2025
37753fd
Update gaol version from 4.2.0 to current master branch (called 4.2.3…
cyrilbouvier Feb 26, 2025
c560e58
Update .gitignore
gchabert Mar 7, 2025
107cfb6
Expr: fix spurious inline (minor)
gchabert Mar 7, 2025
f3e0126
Fix cppunit dependency in tests/CMakeLists.txt
gchabert Mar 7, 2025
eab0f80
Github actions: add Gaol for MacOS
gchabert Mar 7, 2025
d26e61e
Gaol: Fix ultim dependency in CMakeLists.txt
gchabert Mar 7, 2025
f68f5b3
Add tmp interval test
gchabert Mar 7, 2025
c539a8f
Mathlib: new archive
gchabert Mar 7, 2025
46cad55
Gaol: new archive
gchabert Mar 7, 2025
da04c76
Mathlib: update scripts
gchabert Mar 8, 2025
2cfad54
Gaol: update patch
gchabert Mar 9, 2025
971f8eb
Gaol wrapper: fix rounding issue with nextafter on MacOS Arm64
gchabert Mar 9, 2025
d96073e
Gaol: update patch (again)
gchabert Mar 9, 2025
ce4be16
Discard TestTimer
gchabert Mar 9, 2025
0539927
Upload artefacts (gaol/mathlib configuration)
gchabert Mar 9, 2025
f4b98cc
Do not allow ibex+filib on MacOS Arm64 (see #561)
gchabert Mar 9, 2025
e02fc71
Remove older gaol 4.2.0 and mathlib 2.1.0
gchabert Mar 9, 2025
0623b1f
Gitlab runner: remove Filib test on MacOS (see #561)
gchabert Mar 9, 2025
908d74a
Cleaning up gaol/CMakeLists.txt
gchabert Mar 12, 2025
51ec8b2
Java: update CmakeLists.txt
gchabert Mar 14, 2025
1a3063c
Compilation Win32/SHARED: add path to import linker files (.lib)
gchabert Mar 14, 2025
c711224
[MSVC] Set DLL import/export macro
gchabert Mar 16, 2025
5222bf5
[soplex] update CMakesLists (minor)
gchabert Mar 16, 2025
11d3629
[MSCV] Update CMakeLists for Filib & ibex
gchabert Mar 16, 2025
049d9d5
Add constexpr cpp declaration (c++11 does not guarantee inlining)
gchabert Mar 19, 2025
5357f8a
Minor fix in tests
gchabert Mar 22, 2025
53a14c2
Appveyor: fix script
gchabert Mar 22, 2025
6e201be
tests: fix minor issues
gchabert Mar 22, 2025
94bdf20
Add DLL_PORT to extern variables
gchabert Mar 22, 2025
4e2a387
Soplex: force to be static under Windows
gchabert Mar 23, 2025
7736565
Parser (Function & System): fix dangling FD with ibexrestart
gchabert Mar 23, 2025
c534af4
TestParser::const08: cleaned up
gchabert Mar 23, 2025
390e848
TestLPSolver: avoid LPSolver copy (pb with statistics?)
gchabert Mar 23, 2025
ae47df9
Doc update
gchabert Mar 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .github/workflows/tests-macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Tests MacOS
on: push
jobs:
macos-cmake-build-and-check:
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v4.1.1
- name: Install dependencies
run: |
brew update
brew install cppunit
- name: CMake
run: |
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=/Users/runner/work/ibex-lib/ibex-lib -DINTERVAL_LIB=${{ matrix.interval_lib }} -DBUILD_JAVA_INTERFACE=ON -DBUILD_SHARED_LIBS=ON -DLP_LIB=${{ matrix.lp_lib }} ..
- name: Upload Gaol configuration file
uses: actions/upload-artifact@v4
with:
name: gaol configuration
path: build/interval_lib_wrapper/gaol/gaol-4.2.3alpha0-build/gaol/gaol_configuration.h
- name: Upload Mathlib configuration file
uses: actions/upload-artifact@v4
with:
name: mathlib configuration
path: build/interval_lib_wrapper/gaol/mathlib-2.1.1-build/src/mathlib_configuration.h
- name: make
run: |
cd build
make VERBOSE=1 install
- name: ibexsolve
run: |
cd build/bin/
export PKG_CONFIG_PATH=/Users/runner/work/ibex-lib/ibex-lib/share/pkgconfig
export DYLD_LIBRARY_PATH=/Users/runner/work/ibex-lib/ibex-lib/lib/:/Users/runner/work/ibex-lib/ibex-lib/lib/ibex/3rd
./ibexsolve -v
- name: make check
run: |
cd build
make check
strategy:
matrix:
interval_lib: [gaol]
lp_lib: [soplex]
33 changes: 33 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Tests self-hosted
on: push
env:
CHECKSUM: 0b026502131e8b9195438f772bebe56409fb5acf9d26cfd1eba303eb92246b32112312827344a01bb71652dc5c3740136e7e360cdd40df1a5466f71fdbf7b0fe
jobs:
linux-cmake-build-and-check:
runs-on: self-hosted
container:
image: ubuntu:latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
- name: Install dependencies
run: |
apt update
apt install -y gcc g++ cmake flex bison libcppunit-dev patch javacc default-jre default-jdk
- name: CMake
run: |
mkdir build
cd build
cmake -DINTERVAL_LIB=${{ matrix.interval_lib }} -DBUILD_JAVA_INTERFACE=ON -DBUILD_SHARED_LIBS=ON -DLP_LIB=${{ matrix.lp_lib }} ..
- name: make
run: |
cd build
make
- name: make check
run: |
cd build
make check
strategy:
matrix:
interval_lib: [gaol, filib]
lp_lib: [soplex]
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,21 @@
__build__

# ibex generated obj
build
lib
include
share
bin
doc/images/*.png
doc/_build

*~


# files in examples
**/examples/*
!**/examples/*cpp
!**/examples/makefile

# results ibex files
*.cov
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ matrix:
- STATIC_OR_SHARED=
- STATIC_OR_SHARED_CMAKE=
- os: osx
osx_image: xcode11
compiler: clang
env:
- INTERVAL_LIB=gaol
Expand All @@ -39,13 +40,15 @@ matrix:
- STATIC_OR_SHARED_CMAKE=
- CXXFLAGS=-std=c++11
- os: osx
osx_image: xcode11
compiler: clang
env:
- INTERVAL_LIB=gaol
- LP_LIB=none
- STATIC_OR_SHARED=--enable-shared
- STATIC_OR_SHARED_CMAKE=-DBUILD_SHARED_LIBS=ON
- CXXFLAGS=-std=c++11

allow_failures:
- os: linux
compiler: gcc
Expand All @@ -63,13 +66,14 @@ addons:
- flex
- bison
- libcppunit-dev

# need this to install dependencies on osx
before_install:
- uname -a
- if [ "$TRAVIS_OS_NAME" = "osx" ] ; then brew update ; brew install flex bison cppunit; fi
homebrew:
packages:
- flex
- bison
- cppunit

install:
- uname -a
- ./waf configure --prefix=$HOME ${STATIC_OR_SHARED} --interval-lib=${INTERVAL_LIB} --lp-lib=${LP_LIB} || cat __build__/*.log
- ./waf build install clean

Expand Down
Loading
Loading