Hello community, here is the log from the commit of package Ipopt for openSUSE:Factory checked in at 2020-10-24 15:17:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Ipopt (Old) and /work/SRC/openSUSE:Factory/.Ipopt.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Ipopt" Sat Oct 24 15:17:34 2020 rev:3 rq:843299 version:3.13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/Ipopt/Ipopt.changes 2020-07-16 12:19:30.643028911 +0200 +++ /work/SRC/openSUSE:Factory/.Ipopt.new.3463/Ipopt.changes 2020-10-24 15:17:56.804257343 +0200 @@ -1,0 +2,19 @@ +Wed Oct 21 21:35:11 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 3.13.3: + * Members of class AmplTNLP are now protected instead of + private. + * Updated Eclipse Public License from 1.0 to 2.0. + * Added example recursive_nlp that uses Ipopt to solves an + optimization problem for the evaluation of the objective + function. + * Fixed dangling pointer problems with Journalist used for + debugging (--with-ipopt-verbosity > 0) when more than one + IpoptApplication is used [gh#coin-or/Ipopt#393]. + * Fixed build problem when using HSL library that does not + include MA27, MA57, or MC19 [gh#coin-or/Ipopt#395]. + * Fixed build of linear-solver loader on Windows + [gh#coin-or/Ipopt#408]. +- Update License tag to EPL-2.0 in keeping with upstream. + +------------------------------------------------------------------- Old: ---- Ipopt-3.13.2.tar.gz New: ---- Ipopt-3.13.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Ipopt.spec ++++++ --- /var/tmp/diff_new_pack.f8rnPp/_old 2020-10-24 15:17:57.676258169 +0200 +++ /var/tmp/diff_new_pack.f8rnPp/_new 2020-10-24 15:17:57.680258173 +0200 @@ -18,10 +18,10 @@ %define shlib libipopt0 Name: Ipopt -Version: 3.13.2 +Version: 3.13.3 Release: 0 Summary: A software package for large-scale nonlinear optimization methods -License: EPL-1.0 +License: EPL-2.0 Group: Development/Libraries/C and C++ URL: https://projects.coin-or.org/Ipopt Source0: https://github.com/coin-or/Ipopt/archive/releases/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -67,6 +67,7 @@ %package java Summary: Java bindings for %{name} +Group: Development/Libraries/C and C++ %description java This package provides the java bindings for %{name} in a jar file. ++++++ Ipopt-3.13.2.tar.gz -> Ipopt-3.13.3.tar.gz ++++++ ++++ 3848 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/.coin-or/projDesc.xml new/Ipopt-releases-3.13.3/.coin-or/projDesc.xml --- old/Ipopt-releases-3.13.2/.coin-or/projDesc.xml 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/.coin-or/projDesc.xml 2020-10-16 15:35:55.000000000 +0200 @@ -85,7 +85,7 @@ <!--Fill in your text below (outside the comment block). --> <projectLicense> Eclipse Public License</projectLicense> - <projectLicenseURL>http://opensource.org/licenses/EPL-1.0</projectLicenseURL> + <projectLicenseURL>http://opensource.org/licenses/EPL-2.0</projectLicenseURL> <!-- Below, you can list other COIN projects your project --> <!-- depends on. These are listed one by one, as in the --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/.travis.yml new/Ipopt-releases-3.13.3/.travis.yml --- old/Ipopt-releases-3.13.2/.travis.yml 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/.travis.yml 2020-10-16 15:35:55.000000000 +0200 @@ -50,8 +50,8 @@ - pushd build - export ADD_CFLAGS="-Wall -Wextra -Werror" - export ADD_CXXFLAGS="-Wall -Wextra -Werror" - - if $VISHIDDEN ; then ADD_CFLAGS="$CFLAGS -fvisibility=hidden" ; fi - - if $VISHIDDEN ; then ADD_CXXFLAGS="$CXXFLAGS -fvisibility=hidden" ; fi + - if $VISHIDDEN ; then ADD_CFLAGS="$ADD_CFLAGS -fvisibility=hidden" ; fi + - if $VISHIDDEN ; then ADD_CXXFLAGS="$ADD_CXXFLAGS -fvisibility=hidden" ; fi - export CFGFLAGS="" - if $NOF77 ; then CFGFLAGS="$CFGFLAGS --disable-f77" ; fi - if $ENABLEDEBUG ; then CFGFLAGS="$CFGFLAGS --enable-debug --with-ipopt-checklevel=5 --with-ipopt-verbosity=5" ; fi @@ -76,6 +76,10 @@ - make - if ! $NOF77 ; then ./solve_problem MBndryCntrl1 10 ; fi - popd + - pushd examples/recursive_nlp + - make + - if ! $NOF77 ; then ./recursive_nlp ; fi + - popd after_failure: - find . -name config.log -exec tail -n 1000 {} \; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/AUTHORS new/Ipopt-releases-3.13.3/AUTHORS --- old/Ipopt-releases-3.13.2/AUTHORS 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/AUTHORS 2020-10-16 15:35:55.000000000 +0200 @@ -126,6 +126,11 @@ - Nai-Yuan Chiang and Victor M. Zavala Tejeda (Argonne National Laboratory) inertia free curvature test in solution of primal-dual system (full approach) +- Brad Bell + recursive NLP example + + examples/recursive_nlp/recursive_nlp.cpp + Contributors of code that is no longer included in Ipopt distribution: - Yifan Hu (Wolfram): Contributed TAUCS interface, implemented in the files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/ChangeLog new/Ipopt-releases-3.13.3/ChangeLog --- old/Ipopt-releases-3.13.2/ChangeLog 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/ChangeLog 2020-10-16 15:35:55.000000000 +0200 @@ -2,6 +2,19 @@ More detailed information about incremental changes can be found in the commit history. +2020-10-16: 3.13.3 + - Members of AmplTNLP class are now protected instead of private. + - Updated Eclipse Public License from 1.0 to 2.0. + - Fixed dangling pointer problems with Journalist used for debugging + (--with-ipopt-verbosity > 0) when more than one IpoptApplication + is used. [#393, thanks to Brad Bell] + - Fixed build problem when using HSL library that does not include + MA27, MA57, or MC19. [#395] + - Added example recursive_nlp that uses Ipopt to solves an + optimization problem for the evaluation of the objective function. + [contributed by Brad Bell] + - Fixed build of linear-solver loader on Windows [#408] + 2020-04-30: 3.13.2 - The C-preprocessor defines COIN_IPOPT_CHECKLEVEL, COIN_IPOPT_VERBOSITY, and FORTRAN_INTEGER_TYPE, which are defined diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/LICENSE new/Ipopt-releases-3.13.3/LICENSE --- old/Ipopt-releases-3.13.2/LICENSE 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/LICENSE 2020-10-16 15:35:55.000000000 +0200 @@ -1,87 +1,260 @@ -Eclipse Public License - v 1.0 +Eclipse Public License - v 2.0 -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. 2. GRANT OF RIGHTS -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). 3. REQUIREMENTS -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; +3.1 If a Contributor Distributes the Program in any form, then: -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. 4. COMMERCIAL DISTRIBUTION -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. 5. NO WARRANTY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. 7. GENERAL -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/Makefile.am new/Ipopt-releases-3.13.3/Makefile.am --- old/Ipopt-releases-3.13.2/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2004, 2008 International Business Machines and others. # All Rights Reserved. # This file is distributed under the Eclipse Public License. - +# # Authors: Carl Laird, Andreas Waechter IBM 2004-08-13 SUBDIRS = src/Common src/LinAlg src/Algorithm src/contrib/CGPenalty @@ -16,10 +16,6 @@ SUBDIRS += contrib/sIPOPT endif -if ALWAYS_FALSE - SUBDIRS += test -endif - doc_DATA = README.md AUTHORS LICENSE .PHONY: test unitTest doc javadoc astyle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/README.md new/Ipopt-releases-3.13.3/README.md --- old/Ipopt-releases-3.13.2/README.md 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/README.md 2020-10-16 15:35:55.000000000 +0200 @@ -55,31 +55,65 @@ Getting Started --------------- -On sufficiently prepared systems, a quick way to build and install Ipopt -is to get the coinbrew script from https://coin-or.github.io/coinbrew/ -and running +Please consult the [detailed installation instructions](https://coin-or.github.io/Ipopt/INSTALL.html) +in the Ipopt documentation. In the following, we only summarize some main points. + +### Dependencies + +Ipopt requires at least one of the following solvers for systems of linear equations: +- MA27, MA57, HSL_MA77, HSL_MA86, or HSL_MA97 from the [Harwell Subroutines Library](http://hsl.rl.ac.uk) (HSL). + It is recommended to use project [ThirdParty-HSL](https://github.com/coin-or-tools/ThirdParty-HSL) to build a HSL library for use by Ipopt. +- [Parallel Sparse Direct Linear Solver](http://www.pardiso-project.org) (Pardiso). + Note, that the Intel Math Kernel Library (MKL) also includes a version of Pardiso, but the one from Pardiso Project often offers better performance. +- [MUltifrontal Massively Parallel sparse direct Solver](http://mumps.enseeiht.fr/) (MUMPS). + It is highly recommended to use project [ThirdParty-Mumps](https://github.com/coin-or-tools/ThirdParty-Mumps) to build a MUMPS library for use by Ipopt. +- [Watson Sparse Matrix Package](http://www.research.ibm.com/projects/wsmp) + +A fast implementation of BLAS and LAPACK is required by Ipopt. + +To build the AMPL interface of Ipopt, the AMPL Solver Library (ASL) is required. +It is recommended to use project [ThirdParty-ASL](https://github.com/coin-or-tools/ThirdParty-ASL) to build a ASL library for use by Ipopt. + +### Build + +After installation of dependencies, an Ipopt build and installation follows these 4 steps: + +1. Run `./configure`. Use `./configure --help` to see available options. + +2. Run `make` to build the Ipopt libraries. If ASL was made available, also Ipopt executables will be build. + +3. Run `make test` to test the Ipopt build. + +4. Run `make install` to install Ipopt (libraries, executables, and header files). + +It is suggested to use the same installation prefix (`--prefix` option of `configure`) +when configuring the build of ThirdParty-ASL, ThirdParty-HSL, ThirdParty-MUMPS, and Ipopt. + +### Using coinbrew + +An alternative to the above steps is to use the `coinbrew` script from +https://coin-or.github.io/coinbrew/. +`coinbrew` automates the download of the source code for ASL, MUMPS, and Ipopt +and the sequential build and installation of these three packages. + +After obtaining the `coinbrew` script, run /path/to/coinbrew fetch Ipopt --no-prompt /path/to/coinbrew build Ipopt --prefix=/dir/to/install --test --no-prompt --verbosity=3 /path/to/coinbrew install Ipopt --no-prompt -The coinbrew script will take care of building and installing the -dependencies ASL and Mumps before building Ipopt. - More details on using coinbrew can be found at the instructions on [Getting Started with the COIN-OR Optimization Suite](https://coin-or.github.io/user_introduction). -If using coinbrew is not sufficient, then the -[installation instructions in the Ipopt documentation](https://coin-or.github.io/Ipopt/INSTALL.html) -should be studied. +### Precompiled binaries Some precompiled binaries of Ipopt are also available: -- **[JuliaOpt provides Ipopt binaries](https://github.com/JuliaOpt/IpoptBuilder/releases)** +- **[Ipopt releases page](https://github.com/coin-or/Ipopt/releases)** +- **[JuliaBinaryWrappers provides Ipopt binaries](https://github.com/JuliaBinaryWrappers/Ipopt_jll.jl/releases)** - **[AMPL provides binaries](http://ampl.com/products/solvers/open-source/#ipopt)** for using Ipopt through AMPL - **[Pardiso project provides binaries](https://pardiso-project.org/index.html#binaries)** for using Ipopt with Pardiso through Matlab - Getting Help ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/configure.ac new/Ipopt-releases-3.13.3/configure.ac --- old/Ipopt-releases-3.13.2/configure.ac 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/configure.ac 2020-10-16 15:35:55.000000000 +0200 @@ -1,19 +1,17 @@ # Copyright (C) 2004, 2011 International Business Machines and others. # All Rights Reserved. # This file is distributed under the Eclipse Public License. - +# # Authors: Carl Laird, Andreas Waechter IBM 2004-08-13 ############################################################################# # Names and other basic things # ############################################################################# -AC_PREREQ(2.59) - -AC_INIT([Ipopt],[3.13.2],[https://github.com/coin-or/Ipopt/issues/new],,[https://github.com/coin-or/Ipopt]) +AC_INIT([Ipopt],[3.13.3],[https://github.com/coin-or/Ipopt/issues/new],,[https://github.com/coin-or/Ipopt]) -AC_COPYRIGHT( -[Copyright 2004, 2011 International Business Machines and others. +AC_COPYRIGHT([ +Copyright 2004, 2011 International Business Machines and others. All Rights Reserved. This file is part of the open source package IPOPT which is distributed under the Eclipse Public License.]) @@ -65,11 +63,6 @@ AC_COIN_CHK_LIBM(IpoptLib) -#AC_COIN_CHK_BLAS(IpoptLib) -#if test $coin_has_blas != yes; then -# AC_MSG_ERROR([Required package BLAS not found.]) -#fi - AC_COIN_CHK_LAPACK(IpoptLib) if test $coin_has_lapack != yes; then AC_MSG_ERROR([Required package LAPACK not found.]) @@ -395,8 +388,7 @@ AM_CONDITIONAL([BUILD_LINEARSOLVERLOADER],[test $use_linearsolverloader = yes]) AC_LANG_PUSH(C) -AC_CHECK_HEADER([windows.h]) -AC_CHECK_HEADER([dlfcn.h]) +AC_CHECK_HEADER([windows.h],AC_DEFINE(HAVE_WINDOWS_H,[1],[Define to 1 if windows.h is available.])) AC_CHECK_LIB(dl,[dlopen],[IPOPTLIB_LFLAGS="$IPOPTLIB_LFLAGS -ldl"],[]) AC_CHECK_FUNCS([snprintf _snprintf],[break]) AC_CHECK_FUNCS([vsnprintf _vsnprintf],[break]) @@ -541,6 +533,7 @@ ipopt.pc doc/Doxyfile examples/Cpp_example/Makefile + examples/recursive_nlp/Makefile examples/hs071_cpp/Makefile examples/hs071_c/Makefile examples/ScalableProblems/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/contrib/RInterface/inst/doc/ipoptr.Rnw new/Ipopt-releases-3.13.3/contrib/RInterface/inst/doc/ipoptr.Rnw --- old/Ipopt-releases-3.13.2/contrib/RInterface/inst/doc/ipoptr.Rnw 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/contrib/RInterface/inst/doc/ipoptr.Rnw 2020-10-16 15:35:55.000000000 +0200 @@ -50,7 +50,7 @@ \end{eqnarray*} where $f(x): R^n \rightarrow R$ is the objective function, and $g(x): R^n \rightarrow R^m$ are the constraint functions. The vectors $g_L$ and $g_U$ denote the lower and upper bounds on the constraints, and the vectors $x_L$ and $x_U$ are the bounds on the variables $x$. The functions $f(x)$ and $g(x)$ can be nonlinear and nonconvex, but should be twice continuously differentiable. Note that equality constraints can be formulated in the above formulation by setting the corresponding components of $g_L$ and $g_U$ to the same value. -This vignette describes how to formulate minimization problems to be solved with the R interface to Ipopt. If you want to use the C++ interface directly or are interested in the Matlab interface, there are other sources of documentation avialable. Some of the information here is heavily based on the Ipopt Wiki\footnote{\texttt{https://projects.coin-or.org/Ipopt}} and generally that is a good source to find additional information, for instance on which options to use. All credit for implementing the C++ code for Ipopt should go to Andreas W\"achter and Carl Laird. Please show your appreciation by citing their paper. +This vignette describes how to formulate minimization problems to be solved with the R interface to Ipopt. If you want to use the C++ interface directly or are interested in the Matlab interface, there are other sources of documentation available. Some of the information here is heavily based on the Ipopt documentation\footnote{\texttt{https://coin-or.github.io/Ipopt/}} and generally that is a good source to find additional information, for instance on which options to use. All credit for implementing the C++ code for Ipopt should go to Andreas W\"achter and Carl Laird. Please show your appreciation by citing their paper. \section{Installation} Installing the \texttt{ipoptr} package is not as straightforward as most other R packages, because it depends on Ipopt. To install (and compile) Ipopt and the R interface a C/C++ compiler has to be available. On Windows I was successful using MSYS to compile Ipopt and then use Rtools\footnote{\texttt{http://www.murdoch-sutherland.com/Rtools/}} to compile the R interface from source. On Ubuntu no additional tools were needed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/contrib/sIPOPT/doc/sipopt.bib new/Ipopt-releases-3.13.3/contrib/sIPOPT/doc/sipopt.bib --- old/Ipopt-releases-3.13.2/contrib/sIPOPT/doc/sipopt.bib 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/contrib/sIPOPT/doc/sipopt.bib 2020-10-16 15:35:55.000000000 +0200 @@ -335,8 +335,7 @@ organization = {Carnegie Mellon University}, year = {2011}, owner = {rlopezne}, - timestamp = {2011.03.28}, - url = {https://projects.coin-or.org/Ipopt} + timestamp = {2011.03.28} } @UNPUBLISHED{pirnay:2011, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/contrib/sIPOPT/doc/sipopt_manual.tex new/Ipopt-releases-3.13.3/contrib/sIPOPT/doc/sipopt_manual.tex --- old/Ipopt-releases-3.13.2/contrib/sIPOPT/doc/sipopt_manual.tex 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/contrib/sIPOPT/doc/sipopt_manual.tex 2020-10-16 15:35:55.000000000 +0200 @@ -785,7 +785,7 @@ found in the following website. \begin{description} -\item \texttt{http://www.coin-or.org/Ipopt/documentation/} +\item \texttt{https://coin-or.github.io/Ipopt/} \end{description} Also note that in the following we refer to {\tt \ipoptf} as the main folder, @@ -929,4 +929,4 @@ \end{tabular} -\end{document} \ No newline at end of file +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/contrib/sIPOPT/src/Makefile.am new/Ipopt-releases-3.13.3/contrib/sIPOPT/src/Makefile.am --- old/Ipopt-releases-3.13.2/contrib/sIPOPT/src/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/contrib/sIPOPT/src/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -34,9 +34,10 @@ SensSimpleBacksolver.cpp \ SensStdStepCalc.cpp -libsipopt_la_LDFLAGS = $(LT_LDFLAGS) libsipopt_la_LIBADD = ../../../src/Interfaces/libipopt.la +AM_LDFLAGS = $(LT_LDFLAGS) + AM_CPPFLAGS = -DSIPOPTLIB_BUILD \ -I$(srcdir)/../../../src/Common \ -I$(srcdir)/../../../src/Interfaces \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/doc/install.dox new/Ipopt-releases-3.13.3/doc/install.dox --- old/Ipopt-releases-3.13.2/doc/install.dox 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/doc/install.dox 2020-10-16 15:35:55.000000000 +0200 @@ -15,28 +15,6 @@ are a valuable resource of information. --> -\section COINBREW Quick Start: Using CoinBrew - -On sufficiently prepared systems, a quick way to build and install \Ipopt -is to get the coinbrew script from https://coin-or.github.io/coinbrew/ -and running - - /path/to/coinbrew fetch Ipopt --no-prompt - /path/to/coinbrew build Ipopt --prefix=/dir/to/install --test --no-prompt --verbosity=3 - /path/to/coinbrew install Ipopt --no-prompt - -The coinbrew script will take care of building and installing the -dependencies ASL and Mumps before building \Ipopt. -To use HSL sources, change to the `ThirdParty/HSL` directory created by -`coinbrew fetch` and follow the download instructions (i.e., skip the build step) -from \ref DOWNLOAD_HSL. Then proceed with the `coinbrew build` step. - -More details on using coinbrew can be found at the instructions on -[Getting Started with the COIN-OR Optimization Suite](https://coin-or.github.io/user_introduction). - -If these commands fail or this build is not sufficient, the following sections -and the help of coinbrew should be studied. - \section SYSTEMPACKAGES Getting System Packages (Compilers, ...) \subsection SYSTEMPACKAGES_LINUX Linux distributions @@ -150,12 +128,10 @@ to ensure that your downloading and usage of the third party components conforms with their licenses. -For a number of dependencies, COIN-OR provides specialized build systems +For ASL, HSL, and MUMPS, COIN-OR provides specialized build systems that produce libraries which are easy to use with the build system of \Ipopt. Some of the specialized build systems also come with a script that makes it -easy to download the code using `wget` (or `curl` on Mac OS X). If these -tools are not available on your system, please read the appropriate -`INSTALL.*` file for alternative instructions. +easy to download the code using `wget` or `curl`. \subsection EXTERNALCODE_ASL ASL (Ampl Solver Library) @@ -234,7 +210,7 @@ You may either: - Compile the HSL code via the COIN-OR Tools project - [ThirdParty-HSL](https://github.com/coin-or-tools/ThirdParty-HSL) + [ThirdParty-HSL](https://github.com/coin-or-tools/ThirdParty-HSL). See the instructions below. - Compile the HSL code separately either before or after the @@ -377,6 +353,10 @@ library. Once you obtained the library and license, please check if the version number of the library matches the one on the WSMP website. +\note The license included in package of the libraries may not work and a + working one may need to be downloaded separately. Look out for messages + about an invalid WSMP license when testing the Ipopt build. + If a newer version is announced on that website, you can (and probably should) request the current version by sending a message to `w...@us.ibm.com`. Please include the operating system and other @@ -389,10 +369,11 @@ linker flags for the library with the `--with-wsmp` flag, including required additional libraries and flags. For example, if you want to compile \Ipopt with WSMP (located in `$HOME/lib`) on an Intel IA32 Linux system, -you should use the `configure` flag +you may use the `configure` flag \verbatim ---with-wsmp="$HOME/lib/wsmp/wsmp-Linux/lib/IA32/libwsmp.a -lpthread" +--with-wsmp="$HOME/lib/wsmp/wsmp-Linux/lib/IA32/libwsmp.a -lpthread -lblas -llapack -lpthread -lm -lgfortran" \endverbatim +But the actual flags depend on WSMP library and your preference for the Blas/Lapack libraries. \subsection LINEARSOLVERLOADER Using the Linear Solver Loader @@ -690,6 +671,29 @@ Configure flags specific to the use of \Ipopt's dependencies were discussed in the corresponding sections of \ref EXTERNALCODE. + +\section COINBREW Using CoinBrew + +On sufficiently prepared systems, an alternative way to download, build, +and install \Ipopt with dependencies ASL, HSL, and MUMPS is to use the +coinbrew script from https://coin-or.github.io/coinbrew/ + +After obtaining the script, run + + /path/to/coinbrew fetch Ipopt --no-prompt + /path/to/coinbrew build Ipopt --prefix=/dir/to/install --test --no-prompt --verbosity=3 + /path/to/coinbrew install Ipopt --no-prompt + +The coinbrew script will take care of building and installing the +dependencies ASL and Mumps before building \Ipopt. +To use HSL sources, change to the `ThirdParty/HSL` directory created by +`coinbrew fetch` and follow the download instructions (i.e., skip the build step) +from \ref DOWNLOAD_HSL. Then proceed with the `coinbrew build` step. + +More details on using coinbrew can be found at the instructions on +[Getting Started with the COIN-OR Optimization Suite](https://coin-or.github.io/user_introduction). + + \section INSTALL_R Compiling and Installing the R Interface ipoptr The `ipoptr` interface can be build after \Ipopt has been diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/doc/interfaces.dox new/Ipopt-releases-3.13.3/doc/interfaces.dox --- old/Ipopt-releases-3.13.2/doc/interfaces.dox 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/doc/interfaces.dox 2020-10-16 15:35:55.000000000 +0200 @@ -568,7 +568,7 @@ ****************************************************************************** This program contains Ipopt, a library for large-scale nonlinear optimization. Ipopt is released as open source code under the Eclipse Public License (EPL). - For more information visit http://projects.coin-or.org/Ipopt + For more information visit https://github.com/coin-or/Ipopt ****************************************************************************** Number of nonzeros in equality constraint Jacobian...: 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/doc/main.dox new/Ipopt-releases-3.13.3/doc/main.dox --- old/Ipopt-releases-3.13.2/doc/main.dox 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/doc/main.dox 2020-10-16 15:35:55.000000000 +0200 @@ -70,7 +70,7 @@ those changes public and to clearly indicate which modifications you made. After all, the goal of open source software is the continuous development and improvement of software. For details, please refer to -the [Eclipse Public License](https://opensource.org/licenses/EPL-1.0). +the [Eclipse Public License](https://opensource.org/licenses/EPL-2.0). Also, if you are using \Ipopt to obtain results for a publication, we politely ask you to point out in your paper that you @@ -100,13 +100,15 @@ - From hardware vendors: - - ACML (AMD Core Math Library) by AMD + - [Accelerate](https://developer.apple.com/documentation/accelerate) Framework by Apple - - ESSL (Engineering Scientific Subroutine Library) by IBM + - [BLIS](https://github.com/amd/blis) (BLAS-like Library Instantiation Software Framework) by AMD - - MKL (Math Kernel Library) by Intel + - [ESSL](https://www.ibm.com/support/knowledgecenter/en/SSFHY8/essl_welcome.html) (Engineering Scientific Subroutine Library) by IBM - - Sun Performance Library by Sun + - [MKL](https://software.intel.com/content/www/us/en/develop/tools/math-kernel-library.html) (Math Kernel Library) by Intel + + - [Sun Performance Library](https://docs.oracle.com/cd/E18659_01/html/821-2763/gjgis.html) by Sun - Generic: @@ -221,16 +223,16 @@ There is also software that facilitates use of \Ipopt maintained by other people, among them are: -- [ADOL-C](https://projects.coin-or.org/ADOL-C) (automatic differentiation) +- [ADOL-C](https://github.com/coin-or/ADOL-C) (automatic differentiation) ADOL-C facilitates the evaluation of first and higher derivatives of vector functions that are defined by computer programs written in C - or C++. It comes with [examples](https://projects.coin-or.org/ADOL-C/browser/stable/2.4/ADOL-C/examples/additional_examples/ipopt) + or C++. It comes with [examples](https://github.com/coin-or/ADOL-C/tree/master/ADOL-C/examples/additional_examples/ipopt) that show how to use it in connection with \Ipopt. - AIMMS (modeling environment) - The [AIMMSlinks project](https://projects.coin-or.org/AIMMSlinks) on + The [AIMMSlinks project](https://github.com/coin-or/AIMMSlinks) on COIN-OR, maintained by Marcel Hunting, provides an interface for \Ipopt within the AIMMS modeling tool. @@ -244,12 +246,12 @@ CasADi is a symbolic framework for automatic differentiation and numeric optimization and comes with \Ipopt. -- [CppAD](https://projects.coin-or.org/CppAD) (automatic differentiation) +- [CppAD](https://github.com/coin-or/CppAD) (automatic differentiation) Given a C++ algorithm that computes function values, CppAD generates an algorithm that computes corresponding derivative values (of arbitrary order using either forward or reverse mode). It comes with - an [example](http://www.coin-or.org/CppAD/Doc/ipopt_solve.htm) that + an [example](https://coin-or.github.io/CppAD/doc/ipopt_solve.htm) that shows how to use it in connection with \Ipopt. - [csipopt](https://github.com/cureos/csipopt) @@ -258,7 +260,7 @@ - GAMS (modeling environment) - The [GAMSlinks project](https://projects.coin-or.org/GAMSlinks) on + The [GAMSlinks project](https://github.com/coin-or/GAMSlinks) on COIN-OR includes a GAMS interface for \Ipopt. - [ifopt](https://github.com/ethz-adrl/ifopt) @@ -293,7 +295,7 @@ nonlinear, continuous and discrete optimization problem and comes with \Ipopt, including binaries. -- [Optimization Services](https://projects.coin-or.org/OS) +- [Optimization Services](https://github.com/coin-or/OS) The Optimization Services (OS) project provides a set of standards for representing optimization instances, results, solver options, @@ -304,9 +306,9 @@ An interface to the **Python** language. -- Scilab (free Matlab-like environment): +- [Scilab](https://www.scilab.org/) (free Matlab-like environment): - A Scilab interface is available at http://forge.scilab.org/index.php/p/sci-ipopt. + A Scilab interface is available at https://atoms.scilab.org/toolboxes/sci_ipopt. \subsection MOREINFO More Information and Contributions @@ -395,7 +397,7 @@ (Department of Industrial Engineering and Management Sciences, Northwestern University). The following names used in this document are trademarks or registered -trademarks: AMPL, IBM, Intel, Matlab, Microsoft, MKL, Visual Studio C++, +trademarks: Apple, AMPL, IBM, Intel, Matlab, Microsoft, MKL, Visual Studio C++, Visual Studio C++ .NET @@ -409,7 +411,7 @@ \page LICENSE License -\Ipopt is available under the Eclipse Public License 1.0: +\Ipopt is available under the Eclipse Public License: \verbinclude LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/examples/recursive_nlp/recursive_nlp.cpp new/Ipopt-releases-3.13.3/examples/recursive_nlp/recursive_nlp.cpp --- old/Ipopt-releases-3.13.2/examples/recursive_nlp/recursive_nlp.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/Ipopt-releases-3.13.3/examples/recursive_nlp/recursive_nlp.cpp 2020-10-16 15:35:55.000000000 +0200 @@ -0,0 +1,270 @@ +// Copyright (C) 2020 COIN-OR Foundation +// All Rights Reserved. +// This code is published under the Eclipse Public License 2.0. +// +// Author: Brad Bell + +/** @file recursive_nlp.cpp + * + * This solve a NLP where the objective function is defined as a solution point of a NLP. + * Both the outer and the inner problem are solved by Ipopt. + * (For simplicity, the inner problem is very similar to the outer problem.) + * + * Inner problem: minimize exp [ 0.5 * (x - a)^2 + 0.5 * x^2 ] w.r.t x + * Define y(a): arg_min exp [ 0.5 * (x - a)^2 + 0.5 * x^2 ] w.r.t x + * Outer problem: minimize exp [ 0.5 * (y(a) - a)^2 + 0.5 * y(a)^2 ] w.r.t a + */ + +#include "IpIpoptApplication.hpp" +#include "IpTNLP.hpp" + +#include <iostream> +#include <cassert> +#include <cmath> + +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wunused-parameter" +#endif + +using namespace Ipopt; + +class recursive_nlp: public TNLP +{ +private: + const bool inner_; + const Number a_; + Number arg_min_; + Number y_; + +public: + // arg_min + Number arg_min(void) const + { + return arg_min_; + } + + // constructor for the inner problem + recursive_nlp(const Number &a) + : inner_(true), + a_(a), + arg_min_(0.0), + y_(0.0) + { } + + // constructor for the outer problem + recursive_nlp(void) + : inner_(false), + a_(0.0), + arg_min_(0.0), + y_(0.0) + { } + + // default destructor + virtual ~recursive_nlp() { } + + // get_nlp_info + bool get_nlp_info( + Index& n, + Index& m, + Index& nnz_jac_g, + Index& nnz_h_lag, + IndexStyleEnum& index_style) + { + n = 1; + m = 0; + nnz_jac_g = 0; + nnz_h_lag = 1; + index_style = C_STYLE; + + return true; + } + + // get_bounds_info + bool get_bounds_info( + Index n, + Number* x_l, + Number* x_u, + Index m, + Number* g_l, + Number* g_u) + { + assert(n == 1 && m == 0); + + /* default Ipopt value for "infinity" is 1e20 */ + x_l[0] = -1e20; + x_u[0] = +1e20; + + return true; + } + + // get_starting_point + bool get_starting_point( + Index n, + bool init_x, + Number* x, + bool init_z, + Number* z_L, + Number* z_U, + Index m, + bool init_lambda, + Number* lambda) + { + assert(n == 1 && m == 0 && init_x); + + // x[0] == 0 is solution for outer problem + x[0] = 2.0; + + return true; + } + + // eval_f + bool eval_f( + Index n, + const Number* x, + bool new_x, + Number& obj_value) + { + assert(n == 1); + + if( inner_ ) + { + Number arg = 0.5 * (x[0] - a_) * (x[0] - a_) + 0.5 * x[0] * x[0]; + obj_value = exp(arg); + return true; + } + + if( new_x ) + { + // solve the inner problem with corresponding to x[0] + SmartPtr<IpoptApplication> app = IpoptApplicationFactory(); + app->Options()->SetIntegerValue("print_level", J_STRONGWARNING); + app->Options()->SetStringValue("hessian_approximation", "limited-memory"); + ApplicationReturnStatus status = app->Initialize(); + if( status != Solve_Succeeded ) + return false; + + SmartPtr<recursive_nlp> nlp = new recursive_nlp(x[0]); + status = app->OptimizeTNLP(nlp); + if( status != Solve_Succeeded ) + return false; + + // set y_ equal to the arg_min for the inner problem + y_ = nlp->arg_min(); + } + + // evaluate object for the outer problem + Number arg = 0.5 * (y_ - x[0]) * (y_ - x[0]) + 0.5 * y_ * y_; + obj_value = exp(arg); + + return true; + } + + // eval_grad_f + bool eval_grad_f( + Index n, + const Number* x, + bool new_x, + Number* grad_f) + { + assert(n == 1); + + // evaluate objective, if new_x and outer problem also update y_ + Number obj_value; + eval_f(n, x, new_x, obj_value); + + if( inner_ ) + { + grad_f[0] = obj_value * ((x[0] - a_) + x[0]); + return true; + } + + // use fact that gradient of outer objective w.r.t y_ is zero + grad_f[0] = obj_value * (x[0] - y_); + + return true; + } + + // eval_g + bool eval_g( + Index n, + const Number* x, + bool new_x, + Index m, + Number* g) + { + assert(n == 1 && m == 0); + + return true; + } + + // eval_jac_g + bool eval_jac_g( + Index n, + const Number* x, + bool new_x, + Index m, + Index nele_jac, + Index* iRow, + Index* jCol, + Number* values) + { + assert(n == 1 && m == 0 && nele_jac == 0); + + return true; + } + + // eval_h + bool eval_h( + Index n, + const Number* x, + bool new_x, + Number obj_factor, + Index m, + const Number* lambda, + bool new_lambda, + Index nele_hess, + Index* iRow, + Index* jCol, + Number* values) + { + // using an approximate Hessian + return false; + } + + // finalize_solution + void finalize_solution( + SolverReturn status, + Index n, + const Number* x, + const Number* z_L, + const Number* z_U, + Index m, + const Number* g, + const Number* lambda, + Number obj_value, + const IpoptData* ip_data, + IpoptCalculatedQuantities* ip_cq) + { + assert(n == 1 && m == 0); + + arg_min_ = x[0]; + } +}; + +int main(int argc, char** argv) +{ + SmartPtr<IpoptApplication> app = IpoptApplicationFactory(); + ApplicationReturnStatus status = app->Initialize(); + assert(status == Solve_Succeeded); + + app->Options()->SetStringValue("derivative_test", "first-order"); + app->Options()->SetStringValue("hessian_approximation", "limited-memory"); + + SmartPtr<recursive_nlp> nlp = new recursive_nlp(); + status = app->OptimizeTNLP(nlp); + + if( status == Solve_Succeeded ) + std::cout << "nlp->arg_min() = " << nlp->arg_min() << "\n"; + + return EXIT_SUCCESS; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/ipopt.pc.in new/Ipopt-releases-3.13.3/ipopt.pc.in --- old/Ipopt-releases-3.13.2/ipopt.pc.in 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/ipopt.pc.in 2020-10-16 15:35:55.000000000 +0200 @@ -4,9 +4,9 @@ libdir=@libdir@ includedir=@includedir@/coin-or -Name: IPOPT +Name: @PACKAGE_NAME@ Description: Interior Point Optimizer -URL: https://github.com/coin-or/Ipopt +URL: @PACKAGE_URL@ Version: @PACKAGE_VERSION@ Cflags: -I${includedir} @COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lipopt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Algorithm/Inexact/Makefile.am new/Ipopt-releases-3.13.3/src/Algorithm/Inexact/Makefile.am --- old/Ipopt-releases-3.13.2/src/Algorithm/Inexact/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Algorithm/Inexact/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -24,8 +24,6 @@ IpIterativePardisoSolverInterface.cpp \ IpIterativeSolverTerminationTester.cpp -#libinexact_la_LDFLAGS = $(LT_LDFLAGS) - AM_CPPFLAGS = \ -I$(srcdir)/../../Common \ -I$(srcdir)/../../LinAlg \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Algorithm/IpIpoptAlg.cpp new/Ipopt-releases-3.13.3/src/Algorithm/IpIpoptAlg.cpp --- old/Ipopt-releases-3.13.2/src/Algorithm/IpIpoptAlg.cpp 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Algorithm/IpIpoptAlg.cpp 2020-10-16 15:35:55.000000000 +0200 @@ -987,7 +987,7 @@ "\n******************************************************************************\n" "This program contains Ipopt, a library for large-scale nonlinear optimization.\n" " Ipopt is released as open source code under the Eclipse Public License (EPL).\n" - " For more information visit http://projects.coin-or.org/Ipopt\n"; + " For more information visit https://github.com/coin-or/Ipopt\n"; "******************************************************************************\n\n"); copyright_message_printed = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Algorithm/LinearSolvers/Makefile.am new/Ipopt-releases-3.13.3/src/Algorithm/LinearSolvers/Makefile.am --- old/Ipopt-releases-3.13.2/src/Algorithm/LinearSolvers/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Algorithm/LinearSolvers/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -45,8 +45,6 @@ liblinsolvers_la_SOURCES += IpMumpsSolverInterface.cpp endif -#liblinsolvers_la_LDFLAGS = $(LT_LDFLAGS) - AM_CPPFLAGS = \ -I$(srcdir)/../../Common \ -I$(srcdir)/../../LinAlg \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Algorithm/Makefile.am new/Ipopt-releases-3.13.3/src/Algorithm/Makefile.am --- old/Ipopt-releases-3.13.2/src/Algorithm/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Algorithm/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -78,8 +78,6 @@ IpUserScaling.cpp \ IpWarmStartIterateInitializer.cpp -#libipoptalg_la_LDFLAGS = $(LT_LDFLAGS) - AM_CPPFLAGS = \ -I$(srcdir)/../Common \ -I$(srcdir)/../LinAlg \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Apps/AmplSolver/AmplTNLP.hpp new/Ipopt-releases-3.13.3/src/Apps/AmplSolver/AmplTNLP.hpp --- old/Ipopt-releases-3.13.2/src/Apps/AmplSolver/AmplTNLP.hpp 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Apps/AmplSolver/AmplTNLP.hpp 2020-10-16 15:35:55.000000000 +0200 @@ -596,6 +596,7 @@ ); //@} +protected: /** Journalist */ SmartPtr<const Journalist> jnlst_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Apps/AmplSolver/Makefile.am new/Ipopt-releases-3.13.3/src/Apps/AmplSolver/Makefile.am --- old/Ipopt-releases-3.13.2/src/Apps/AmplSolver/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Apps/AmplSolver/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2004, 2006 International Business Machines and others. # All Rights Reserved. # This file is distributed under the Eclipse Public License. - +# # Authors: Carl Laird, Andreas Waechter IBM 2004-08-13 lib_LTLIBRARIES = libipoptamplinterface.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Apps/AmplSolver/ipoptamplinterface.pc.in new/Ipopt-releases-3.13.3/src/Apps/AmplSolver/ipoptamplinterface.pc.in --- old/Ipopt-releases-3.13.2/src/Apps/AmplSolver/ipoptamplinterface.pc.in 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Apps/AmplSolver/ipoptamplinterface.pc.in 2020-10-16 15:35:55.000000000 +0200 @@ -6,7 +6,7 @@ Name: IPOPT-AMPL Description: Ampl Interface TNLP to Ipopt -URL: https://github.com/coin-or/Ipopt +URL: @PACKAGE_URL@ Version: @PACKAGE_VERSION@ Cflags: -I${includedir} @COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lipoptamplinterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Common/IpDebug.hpp new/Ipopt-releases-3.13.3/src/Common/IpDebug.hpp --- old/Ipopt-releases-3.13.2/src/Common/IpDebug.hpp 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Common/IpDebug.hpp 2020-10-16 15:35:55.000000000 +0200 @@ -97,16 +97,18 @@ ... ); +private: + friend class IpoptApplication; /* Method for initialization of the static GLOBAL journalist, * through with all debug printout is to be written. * * This needs to be set before any debug printout can be done. + * It is expected that this is only called by the IpoptApplication constructor. */ static void SetJournalist( Journalist* jrnl ); -private: /**@name Default Compiler Generated Methods * (Hidden to avoid implicit creation/calling). * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Common/Makefile.am new/Ipopt-releases-3.13.3/src/Common/Makefile.am --- old/Ipopt-releases-3.13.2/src/Common/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Common/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2004, 2006 International Business Machines and others. # All Rights Reserved. # This file is distributed under the Eclipse Public License. - +# # Authors: Carl Laird, Andreas Waechter IBM 2004-08-13 includeipoptdir = $(includedir)/coin-or @@ -31,8 +31,6 @@ IpTaggedObject.cpp \ IpUtils.cpp -#libcommon_la_LDFLAGS = $(LT_LDFLAGS) - AM_CPPFLAGS = -DIPOPTLIB_BUILD install-exec-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Common/config.h.in new/Ipopt-releases-3.13.3/src/Common/config.h.in --- old/Ipopt-releases-3.13.2/src/Common/config.h.in 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Common/config.h.in 2020-10-16 15:35:55.000000000 +0200 @@ -80,6 +80,9 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF +/* Define to 1 if windows.h is available. */ +#undef HAVE_WINDOWS_H + /* Define to 1 if you have the `_snprintf' function. */ #undef HAVE__SNPRINTF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Common/config_ipopt_default.h new/Ipopt-releases-3.13.3/src/Common/config_ipopt_default.h --- old/Ipopt-releases-3.13.2/src/Common/config_ipopt_default.h 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Common/config_ipopt_default.h 2020-10-16 15:35:55.000000000 +0200 @@ -14,7 +14,7 @@ #define IPOPT_VERSION_MINOR 13 /* Release Version number of project */ -#define IPOPT_VERSION_RELEASE 2 +#define IPOPT_VERSION_RELEASE 3 /* Define to the C type corresponding to Fortran INTEGER */ #ifndef IPOPT_FORTRAN_INTEGER_TYPE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Interfaces/IpIpoptApplication.cpp new/Ipopt-releases-3.13.3/src/Interfaces/IpIpoptApplication.cpp --- old/Ipopt-releases-3.13.2/src/Interfaces/IpIpoptApplication.cpp 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Interfaces/IpIpoptApplication.cpp 2020-10-16 15:35:55.000000000 +0200 @@ -42,6 +42,8 @@ { #if IPOPT_VERBOSITY > 0 static const Index dbg_verbosity = 0; +// Kluge: Add reference counter for DebugJournalistWrapper::jrnl +static SmartPtr<Journalist> smart_jnlst(NULL); #endif IpoptApplication::IpoptApplication( @@ -63,9 +65,16 @@ try { # if IPOPT_VERBOSITY > 0 - DebugJournalistWrapper::SetJournalist(GetRawPtr(jnlst_)); - SmartPtr<Journal> debug_jrnl = jnlst_->AddFileJournal("Debug", "debug.out", J_ITERSUMMARY); - debug_jrnl->SetPrintLevel(J_DBG, J_ALL); + // Kludge: If this is the first IpoptApplication, then store jnlst_ in smart_jnlst, too, so that it doesn't + // get freed when the IpoptApplication is freed and DebugJournalistWrapper::jrnl becomes a dangling pointer. + // Also add the Debug journal that writes to debug.out. + if( IsNull(smart_jnlst) ) + { + smart_jnlst = jnlst_; + DebugJournalistWrapper::SetJournalist(GetRawPtr(jnlst_)); + SmartPtr<Journal> debug_jrnl = jnlst_->AddFileJournal("Debug", "debug.out", J_ITERSUMMARY); + debug_jrnl->SetPrintLevel(J_DBG, J_ALL); + } # endif DBG_START_METH("IpoptApplication::IpoptApplication()", @@ -180,13 +189,15 @@ { debug_print_level = print_level; } - SmartPtr<Journal> debug_jrnl = jnlst_->GetJournal("Debug"); - if (IsNull(debug_jrnl)) - { - debug_jrnl = jnlst_->AddFileJournal("Debug", "debug.out", J_ITERSUMMARY); - } + assert(IsValid(smart_jnlst)); /* should have been created in constructor */ + SmartPtr<Journal> debug_jrnl = smart_jnlst->GetJournal("Debug"); + assert(IsValid(debug_jrnl)); /* should have been added in constructor */ debug_jrnl->SetAllPrintLevels(debug_print_level); debug_jrnl->SetPrintLevel(J_DBG, J_ALL); + if( IsNull(jnlst_->GetJournal("Debug")) ) + { + jnlst_->AddJournal(debug_jrnl); + } #endif // Open an output file if required diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/Interfaces/Makefile.am new/Ipopt-releases-3.13.3/src/Interfaces/Makefile.am --- old/Ipopt-releases-3.13.2/src/Interfaces/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/Interfaces/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2004, 2008 International Business Machines and others. # All Rights Reserved. # This file is distributed under the Eclipse Public License. - +# # Authors: Carl Laird, Andreas Waechter IBM 2004-08-13 includeipoptdir = $(includedir)/coin-or @@ -58,7 +58,7 @@ # probably we need to make this explicit because we set use a variable $(IPALLLIBS) in LIBADD libipopt_la_DEPENDENCIES = $(IPALLLIBS) -libipopt_la_LDFLAGS = $(LT_LDFLAGS) +AM_LDFLAGS = $(LT_LDFLAGS) AM_CPPFLAGS = \ -I$(srcdir)/../Common \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/LinAlg/Makefile.am new/Ipopt-releases-3.13.3/src/LinAlg/Makefile.am --- old/Ipopt-releases-3.13.2/src/LinAlg/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/LinAlg/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -52,8 +52,4 @@ IpZeroMatrix.cpp \ IpZeroSymMatrix.cpp -#liblinalg_la_LDFLAGS = $(LT_LDFLAGS) - -AM_CPPFLAGS = \ - -I$(srcdir)/../Common \ - $(IPOPTLIB_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../Common $(IPOPTLIB_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/LinAlg/TMatrices/Makefile.am new/Ipopt-releases-3.13.3/src/LinAlg/TMatrices/Makefile.am --- old/Ipopt-releases-3.13.2/src/LinAlg/TMatrices/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/LinAlg/TMatrices/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -16,8 +16,6 @@ IpSymTMatrix.cpp \ IpTripletHelper.cpp -#libtmatrices_la_LDFLAGS = $(LT_LDFLAGS) - AM_CPPFLAGS = \ -I$(srcdir)/../../Common \ -I$(srcdir)/.. \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/contrib/CGPenalty/Makefile.am new/Ipopt-releases-3.13.3/src/contrib/CGPenalty/Makefile.am --- old/Ipopt-releases-3.13.2/src/contrib/CGPenalty/Makefile.am 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/contrib/CGPenalty/Makefile.am 2020-10-16 15:35:55.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2007 International Business Machines and others. # All Rights Reserved. # This file is distributed under the Eclipse Public License. - +# # Authors: Andreas Waechter IBM 2007-06-01 noinst_LTLIBRARIES = libcgpenalty.la @@ -15,8 +15,6 @@ IpCGSearchDirCalc.cpp \ IpPiecewisePenalty.cpp -#libcgpenalty_la_LDFLAGS = $(LT_LDFLAGS) - AM_CPPFLAGS = \ -I$(srcdir)/../../Common \ -I$(srcdir)/../../LinAlg \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Ipopt-releases-3.13.2/src/contrib/LinearSolverLoader/HSLLoader.c new/Ipopt-releases-3.13.3/src/contrib/LinearSolverLoader/HSLLoader.c --- old/Ipopt-releases-3.13.2/src/contrib/LinearSolverLoader/HSLLoader.c 2020-04-30 12:39:39.000000000 +0200 +++ new/Ipopt-releases-3.13.3/src/contrib/LinearSolverLoader/HSLLoader.c 2020-10-16 15:35:55.000000000 +0200 @@ -11,6 +11,9 @@ #ifdef IPOPT_HAS_HSL #include "CoinHslConfig.h" +#else +/* use normal C-naming style */ +#define IPOPT_HSL_FUNC(name,NAME) name #endif #include <stdio.h> @@ -37,7 +40,7 @@ static ma27cd_t func_ma27cd = NULL; static ma27id_t func_ma27id = NULL; -void ma27ad( +void IPOPT_HSL_FUNC(ma27ad, MA27AD)( ipfint* N, ipfint* NZ, const ipfint* IRN, @@ -66,7 +69,7 @@ func_ma27ad(N, NZ, IRN, ICN, IW, LIW, IKEEP, IW1, NSTEPS, IFLAG, ICNTL, CNTL, INFO, OPS); } -void ma27bd( +void IPOPT_HSL_FUNC(ma27bd, MA27BD)( ipfint* N, ipfint* NZ, const ipfint* IRN, @@ -96,7 +99,7 @@ func_ma27bd(N, NZ, IRN, ICN, A, LA, IW, LIW, IKEEP, NSTEPS, MAXFRT, IW1, ICNTL, CNTL, INFO); } -void ma27cd( +void IPOPT_HSL_FUNC(ma27cd, MA27CD)( ipfint* N, double* A, ipfint* LA, @@ -123,7 +126,7 @@ func_ma27cd(N, A, LA, IW, LIW, W, MAXFRT, RHS, IW1, NSTEPS, ICNTL, CNTL); } -void ma27id( +void IPOPT_HSL_FUNC(ma27id, MA27ID)( ipfint* ICNTL, double* CNTL ) @@ -150,7 +153,7 @@ static ma57cd_t func_ma57cd = NULL; static ma57ed_t func_ma57ed = NULL; -void ma57id( +void IPOPT_HSL_FUNC(ma57id, MA57ID)( double* cntl, ipfint* icntl ) @@ -167,7 +170,7 @@ func_ma57id(cntl, icntl); } -void ma57ad( +void IPOPT_HSL_FUNC(ma57ad, MA57AD)( ipfint* n, /**< Order of matrix. */ ipfint* ne, /**< Number of entries. */ const ipfint* irn, /**< Matrix nonzero row structure */ @@ -192,7 +195,7 @@ func_ma57ad(n, ne, irn, jcn, lkeep, keep, iwork, icntl, info, rinfo); } -void ma57bd( +void IPOPT_HSL_FUNC(ma57bd, MA57BD)( ipfint* n, /**< Order of matrix. */ ipfint* ne, /**< Number of entries. */ double* a, /**< Numerical values. */ @@ -221,7 +224,7 @@ func_ma57bd(n, ne, a, fact, lfact, ifact, lifact, lkeep, keep, iwork, icntl, cntl, info, rinfo); } -void ma57cd( +void IPOPT_HSL_FUNC(ma57cd, MA57CD)( ipfint* job, /**< Solution job. Solve for... */ ipfint* n, /**< Order of matrix. */ double* fact, /**< Entries of factors. */ @@ -250,7 +253,7 @@ func_ma57cd(job, n, fact, lfact, ifact, lifact, nrhs, rhs, lrhs, work, lwork, iwork, icntl, info); } -void ma57ed( +void IPOPT_HSL_FUNC(ma57ed, MA57ED)( ipfint* n, ipfint* ic, /**< 0: copy real array. >=1: copy integer array. */ ipfint* keep, @@ -938,7 +941,7 @@ static mc19ad_t func_mc19ad = NULL; -void mc19ad( +void IPOPT_HSL_FUNC(mc19ad, MC19AD)( ipfint* N, ipfint* NZ, double* A,
