Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Merge changes from stable/idaes-3.13 into releases/3.14.13 #8

Open
wants to merge 32 commits into
base: idaes-3.14.13
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a5226ab
Try adding Blas and Lapack dependencies. In and attampt to get a static
Mar 25, 2020
bafe334
Okay, that's not helping
Mar 25, 2020
b2ab85e
Add a little to the HSL unknown name mangling to be sure the name
Mar 25, 2020
900e78f
Add the HSL test back
Mar 25, 2020
62f8ef8
Guess and default name mangling for the HSL in the ipopt config script.
Mar 25, 2020
22fbfeb
Slightly better hsl name magle guess
Mar 25, 2020
3e6d366
Add LDFLAGS at the end of the ac_link
Mar 26, 2020
3f2946f
Add ldflags to end of ipopt configure ac_link
Mar 26, 2020
7ab6bab
A lot more flagging.
Mar 26, 2020
91d315d
Update Dependencies
Mar 27, 2020
bb5e41b
Take the AMPL app from 3.12
Mar 27, 2020
2fddbe5
Merge branch 'idaes-3.13' of https://github.com/idaes/ipopt into idae…
Mar 27, 2020
547b139
Put make file stuff back
Mar 27, 2020
40d964c
Modified include to just include cstring
Mar 27, 2020
fcce8cf
Just import cstdio and remove check
Mar 27, 2020
eed5a92
Update Dependencies
Mar 27, 2020
9c1a8de
Update Dependencies
Mar 29, 2020
9bb26d3
Update Dependencies
Mar 29, 2020
aa97b0f
Update Dependencies
Mar 29, 2020
4ef8814
Update Dependencies
Mar 29, 2020
c9c6701
Update Dependencies
Mar 29, 2020
4ae77d2
Switch AMPL App back to 3.13 to test with ASL build tools 1.4
Mar 29, 2020
786a5fb
Merge branch 'idaes-3.13' of https://github.com/idaes/ipopt into idae…
Mar 29, 2020
bdda7d9
Update Dependencies
Mar 29, 2020
c95b5c9
Update Dependencies
Apr 2, 2020
df8bc1e
Update Dependencies
Apr 2, 2020
9b25958
Update Dependencies
Apr 2, 2020
bf3a448
Update Dependencies
Apr 3, 2020
d875854
Update Makefile.am
Feb 27, 2021
7e48cd7
Update Makefile.in
Feb 27, 2021
1559f5f
Merge pull request #2 from IDAES/master
Feb 27, 2021
95893b0
Merge branch 'stable/idaes-3.13' into stable/idaes-3.14. My best attempt
Robbybp Dec 14, 2023
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
7 changes: 4 additions & 3 deletions .coin-or/Dependencies
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ThirdParty/ASL https://github.com/coin-or-tools/ThirdParty-ASL stable/2.0
ThirdParty/HSL https://github.com/coin-or-tools/ThirdParty-HSL stable/2.2
ThirdParty/Mumps https://github.com/coin-or-tools/ThirdParty-Mumps stable/3.0
ThirdParty/ASL https://github.com/coin-or-tools/ThirdParty-ASL stable/2.0
ThirdParty/Metis https://github.com/coin-or-tools/ThirdParty-Metis stable/2.0
ThirdParty/HSL https://github.com/coin-or-tools/ThirdParty-HSL stable/2.0
ThirdParty/Mumps https://github.com/coin-or-tools/ThirdParty-Mumps stable/2.0
10 changes: 10 additions & 0 deletions src/Algorithm/IpIpoptAlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,16 @@ void IpoptAlgorithm::print_copyright_message(
"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 https://github.com/coin-or/Ipopt\n"
"\nThis version of Ipopt was compiled from source code available at\n"
" https://github.com/IDAES/Ipopt as part of the Institute for the Design of\n"
" Advanced Energy Systems Process Systems Engineering Framework (IDAES PSE\n"
" Framework) Copyright (c) 2018-2019. See https://github.com/IDAES/idaes-pse.\n"
"\nThis version of Ipopt was compiled using HSL, a collection of Fortran codes\n"
" for large-scale scientific computation. All technical papers, sales and\n"
" publicity material resulting from use of the HSL codes within IPOPT must\n"
" contain the following acknowledgement:\n"
" HSL, a collection of Fortran codes for large-scale scientific\n"
" computation. See http://www.hsl.rl.ac.uk.\n"
"******************************************************************************\n\n");
copyright_message_printed = true;
}
Expand Down