Skip to content

Commit

Permalink
Doc update and remove -Wno-unused-function in non-debug mode (option …
Browse files Browse the repository at this point in the history
…does not exist for Clang)
  • Loading branch information
Gilles Chabert committed Sep 4, 2019
1 parent 57fec9f commit 98538fe
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
6 changes: 3 additions & 3 deletions doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ In particular, ``waf`` ``configure`` supports the following options:
--with-solver Enable IbexSolver (the plugin is installed by default)


--with-optim Enable IbexOpt (the plugin is installed by default)
--with-optim Enable IbexOpt


--lp-lib=soplex Install Ibex with the LP solver Soplex. The plugin archive contains a version of soplex so it is
Expand All @@ -182,7 +182,7 @@ In particular, ``waf`` ``configure`` supports the following options:
If you install your own version of Soplex, use the following argument::
make ZLIB=false
and if Ibex is installed as a dynamic library (``--enable-shared``), Soplex must also be installed as a
dynamic library. For this, add the option SHARED=true to the previous command::
Expand All @@ -194,7 +194,7 @@ In particular, ``waf`` ``configure`` supports the following options:

.. Warning::

The current release of Ibex is not compatible with Soplex 2.0.
The current release of Ibex is compatible with Soplex 3.1.1


--soplex-path=PATH Set the (absolute) path of Soplex to PATH (to be used with ``--lp-lib=soplex``). The plugin archive contains
Expand Down
22 changes: 11 additions & 11 deletions doc/interval.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ Interval Constants

Some commonly used intervals are already defined as static variables:

======================= ==================================
``Interval::pi()`` a thin enclosure of :math:`\pi`
``Interval::two_pi()`` a thin enclosure of :math:`\pi`
``Interval::half_pi()`` a thin enclosure of :math:`\pi/2`
``Interval::empty_set()`` :math:`\emptyset`
``Interval::all_reals()`` :math:`(-\infty,+\infty)`
``Interval::zero()`` :math:`[0,0]`
``Interval::one()`` :math:`[1,1]`
``Interval::pos_reals()`` :math:`[0,+\infty)`
``Interval::neg_reals()`` :math:`(-\infty,0]`
======================= ==================================
========================== ==================================
``Interval::pi()`` a thin enclosure of :math:`\pi`
``Interval::two_pi()`` a thin enclosure of :math:`\pi`
``Interval::half_pi()`` a thin enclosure of :math:`\pi/2`
``Interval::empty_set()`` :math:`\emptyset`
``Interval::all_reals()`` :math:`(-\infty,+\infty)`
``Interval::zero()`` :math:`[0,0]`
``Interval::one()`` :math:`[1,1]`
``Interval::pos_reals()`` :math:`[0,+\infty)`
``Interval::neg_reals()`` :math:`(-\infty,0]`
========================== ==================================

Let us print all these constants:

Expand Down
6 changes: 1 addition & 5 deletions doc/java-install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,11 @@ Uncompress the archive ibex-2.8.0.tar.gz in some Ibex folder::

~/Ibex/$ tar xvfz ibex-2.8.0.tar.gz

Uncompress the archive ibex-java.tar.gz in the plugin folder::

~/Ibex/$ tar xvfz ibex-java.tar.gz --directory=ibex-2.8.0/plugins

Set the environment variable ``JAVA_HOME``. Typical paths are ``/Library/Java/Home`` (MacOS) or ``/usr/lib/jvm/java-7-openjdk-i38`` (Linux). Example::

~/Ibex/$ export JAVA_HOME=/Library/Java/Home

Under MinGW, the variable must be set in Liux-style (don't use backslash ("\\") as separator), e.g.::
Under MinGW, the variable must be set in Linux-style (don't use backslash ("\\") as separator), e.g.::

~/Ibex/$ export JAVA_HOME=/c/Java/jdk1.7.1_17

Expand Down
4 changes: 2 additions & 2 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ def configure (conf):
# Optimised compilation flags
if conf.options.DEBUG:
Logs.info("Enabling debug mode")
# note: -Wno-int-in-bool-context for Gaol
# note: -Wno-int-in-bool-context for Gaol (but unknown option by clang...)
flags = "-std=c++11 -O0 -g -pg -Wall -Wno-int-in-bool-context"
flags += " -fmessage-length=0"
conf.define ("DEBUG", 1)
conf.env.DEBUG = True
else:
# note: -Wno-int-in-bool-context for Gaol
flags = "-std=c++11 -O3 -Wno-deprecated -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-function -Wno-int-in-bool-context"
flags = "-std=c++11 -O3 -Wno-deprecated -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-function"
conf.define ("NDEBUG", 1)
conf.env.DEBUG = False
for f in flags.split():
Expand Down

0 comments on commit 98538fe

Please sign in to comment.