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

master < develop Solver choice and updated MACRS #566

Merged
merged 41 commits into from
Mar 4, 2024
Merged

master < develop Solver choice and updated MACRS #566

merged 41 commits into from
Mar 4, 2024

Conversation

Bill-Becker
Copy link
Collaborator

@Bill-Becker Bill-Becker commented Feb 28, 2024 •
edited by adfarth

Bill-Becker and others added 30 commits February 1, 2024 20:56
@Bill-Becker
Update main docker-compose.yml to point to opensource Julia env
b70928b
@Bill-Becker
Change julia_src/highs to /opensource for HiGHS and Cbc (and ... later)
fe2ac65
@adfarth
Update models.py
aeed879
@adfarth
Update CHANGELOG.md
0ba0dbe
@Bill-Becker
Remove solver-specific env subfolders
7a66981
@Bill-Becker
Define all opensource (OS) solvers in one file
60a64c3
@Bill-Becker
Move V1/V2 REopt files into julia_src top-level folder
3cd3ba2
@Bill-Becker
Clean and prune solver-specific Docker files
505e838
@Bill-Becker
Update Julia project environment .toml files
127eecc
@Bill-Becker
Update opensource Docker files
33558cb
@Bill-Becker
Use single http.jl with conditional loading for Xpress
4badf67
@Bill-Becker
Add solver input in Settings for HiGHS Cbc SCIP and Xpress
9d578d9
@Bill-Becker
Add Julia precompile.jl with all OS solvers
3ea5351
@Bill-Becker
Update reoptjl tests to use HiGHS or other open source solver
499cf92
@Bill-Becker
Update .gitignore with new solver file locations
c5a79d5
@Bill-Becker
Add back all V3/stable tests to GitHub Actions workflows
7908997
@Bill-Becker
Merge branch 'develop' into solver-choice
c8dfad3
@Bill-Becker
Remove deprecated Cbc push test
f504146
@Bill-Becker
Fix GitHub workflow container build step
9db715f
@Bill-Becker
Fix indent in push_tests.yml
b272f67
@Bill-Becker
Fix Docker V2 container naming
7dbc5b3
@Bill-Becker
Update solver_setup.sh
f8bca38
@Bill-Becker
Re .gitignore solver_setup.sh
f0a8ffb
@Bill-Becker
Remove temp TODO.txt doc
69a7fda
@Bill-Becker
Fix ENV issue when switching from open source to Xpress setup
b31745b
@Bill-Becker
Improve warning message and change to HiGHS if trying to use Xpress w…
557c1a3 
…hen not installed
@Bill-Becker
using Xpress.jl instead of import Xpress.jl
2fbe4bf
@Bill-Becker
Remove irrelevant "why" comment
c0b390f
@Bill-Becker
Update name for push tests to use OS solvers
2c32e0f
@Bill-Becker
Merge pull request #565 from NREL/solver-choice
68cc601 
Choose solver, add back V3 CI tests
@Bill-Becker Bill-Becker marked this pull request as ready for review February 28, 2024 18:17
@Bill-Becker
Copy link
Collaborator Author

@adfarth Just approved your MACRS update PR, so you can merge that into develop to include in this PR too.

@adfarth adfarth changed the title Solver choice Solver choice and updated MACRS Feb 29, 2024
@adfarth adfarth changed the title Solver choice and updated MACRS master < develop Solver choice and updated MACRS Feb 29, 2024
@adfarth
Copy link
Collaborator

adfarth commented Mar 4, 2024

@Bill-Becker I made migrations for the MACRS updates in faf2752 and updated the REopt version in 3306d27. I also went ahead and updated the DotEnv pkg version and made the same change you made in REopt.jl

@adfarth adfarth merged commit b950b25 into master Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adfarth adfarth adfarth approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Bill-Becker @adfarth