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.

Sign up for GitHub

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

Jump to bottom

Refactor CyIpopt interface to subclass cyipopt.Problem #2760

Merged
merged 33 commits into from
Apr 25, 2023
Merged

Refactor CyIpopt interface to subclass cyipopt.Problem #2760

merged 33 commits into from
Apr 25, 2023

Commits on Mar 2, 2023

  1. subclass cyipopt.Problem instead of passing CyIpoptProblemInterface a… 

    …s an argument
    @Robbybp
    Robbybp committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    2ef3754 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. call cyipopt.Problem.__init__ from CyIpoptProblemInterface.__init__

    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    1622477 View commit details
    Browse the repository at this point in the history

  2. add test for error message when cyipopt not available

    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    1196a5b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into cyipopt-subclass

    @Robbybp
    Robbybp authored Mar 3, 2023
    Configuration menu
    Copy the full SHA
    1509831 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'cyipopt-subclass' of https://github.com/robbybp/pyomo i… 

    …nto cyipopt-subclass
    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    20b536e View commit details
    Browse the repository at this point in the history

  5. skip test that uses CyIpoptNLP unless cyipopt_available

    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    fc1a533 View commit details
    Browse the repository at this point in the history

  6. add cyipopt to list of potentially slow-loading modules

    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    0f4503f View commit details
    Browse the repository at this point in the history

  7. do not import cyipopt_available out of pyomo.common.dependencies

    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    436221f View commit details
    Browse the repository at this point in the history

  8. remove cyipopt from slow-loading module set

    @Robbybp
    Robbybp committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    ae55bde View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Merge branch 'main' of https://github.com/pyomo/pyomo into cyipopt-su… 

    …bclass
    @Robbybp
    Robbybp committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    42d4de4 View commit details
    Browse the repository at this point in the history

  2. move CyIpoptNLP and CyIpoptProblemInterface to their own file and int… 

    …roduce a deferred import back into cyipopt_solver
    @Robbybp
    Robbybp committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    60c567f View commit details
    Browse the repository at this point in the history

  3. move cyipopt_interface.py to pynumero/interfaces/

    @Robbybp
    Robbybp committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    67dc2f1 View commit details
    Browse the repository at this point in the history

  4. access cyipopt_available from cyipopt_interface module

    @Robbybp
    Robbybp committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    f06409a View commit details
    Browse the repository at this point in the history

  5. update imports to import CyIpoptNLP out of cyipopt_interfaces instead… 

    … of cyipopt_solver
    @Robbybp
    Robbybp committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    1c56631 View commit details
    Browse the repository at this point in the history

  6. call gc.collect before removing log files to try to make sure ipopt l… 

    …og file is closed
    @Robbybp
    Robbybp committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    028fafe View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Merge branch 'main' into cyipopt-subclass

    @jsiirola
    jsiirola authored Mar 18, 2023
    Configuration menu
    Copy the full SHA
    c956c3a View commit details
    Browse the repository at this point in the history

  2. call close before removing log file to attempt to remove lock

    @Robbybp
    Robbybp committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    c584364 View commit details
    Browse the repository at this point in the history

  3. add call to cyipopt.Problem.close at end of PyomoCyIpoptSolver.solve

    @Robbybp
    Robbybp committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    be5b2b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. add a cyipopt.Problem.close call to a test that was missing it

    @Robbybp
    Robbybp committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    f528f1c View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Merge branch 'main' of https://github.com/pyomo/pyomo into cyipopt-su… 

    …bclass
    @Robbybp
    Robbybp committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    2bab691 View commit details
    Browse the repository at this point in the history

  2. call close() on user-created problem object rather than private _prob… 

    …lem attribute
    @Robbybp
    Robbybp committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    fad198e View commit details
    Browse the repository at this point in the history

  3. note that close must be called to force Ipopt to release its lock on … 

    …the log file
    @Robbybp
    Robbybp committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    e90e242 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. Merge branch 'main' of https://github.com/pyomo/pyomo into cyipopt-su… 

    …bclass

conflicts were resolved by taking the cyipopt-subclass files and running
black on them.
    @Robbybp
    Robbybp committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    8a19dd6 View commit details
    Browse the repository at this point in the history

  2. run black on files I missed

    @Robbybp
    Robbybp committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    2a07e10 View commit details
    Browse the repository at this point in the history

  3. re-run black, now with --skip-string-normalization

    @Robbybp
    Robbybp committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    7edf82d View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Merge branch 'main' of https://github.com/pyomo/pyomo into cyipopt-su… 

    …bclass
    @Robbybp
    Robbybp committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    fb451d9 View commit details
    Browse the repository at this point in the history

  2. update formatting for consistency with black

    @Robbybp
    Robbybp committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    e028e1d View commit details
    Browse the repository at this point in the history

  3. fix indentation

    @Robbybp
    Robbybp committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    eba9b39 View commit details
    Browse the repository at this point in the history

  4. comma at end of arg list

    @Robbybp
    Robbybp committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    20e6b1b View commit details
    Browse the repository at this point in the history

  5. remove whitespace

    @Robbybp
    Robbybp committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    5a8d7b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. Merge branch 'main' of https://github.com/pyomo/pyomo into cyipopt-su… 

    …bclass
    @Robbybp
    Robbybp committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    5dde096 View commit details
    Browse the repository at this point in the history

  2. add flag and check to catch if solve is calledwhen cyipopt.Problem.__… 

    …init__ has not been called
    @Robbybp
    Robbybp committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    928250b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. NFC: Fixing string formatting

    @blnicho
    blnicho authored Apr 24, 2023
    Configuration menu
    Copy the full SHA
    74aadec View commit details
    Browse the repository at this point in the history