-
Notifications
You must be signed in to change notification settings - Fork 42
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
Use HiGHS solver by default and on production, include other OS solvers #574
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
f68d3da
Use REopt.jl develop branch with Big M for HiGHS
Bill-Becker 2bdb08a
Pass Settings.solver_name to REopt for avoiding indicators with HiGHS
Bill-Becker 8816074
Change default solver to HiGHS, increase default and max timeout and …
Bill-Becker b56e6be
Stop installing Xpress solver for internal deployments
Bill-Becker 41b6f9c
End-of-Life for v1 and v2 POSTs for /job endpoint (running REopt)
Bill-Becker 2d3eaaf
Merge branch 'develop' into os-solver
Bill-Becker 3141c33
Increase staging server resources for testing
Bill-Becker 686cba2
Comment out werf solver setup
Bill-Becker 9c6cd63
Fix werf Dockerfile
Bill-Becker 96411c1
Update REopt.jl#develop with Cbc and SCIP using Big M constraints
Bill-Becker 8f92f8e
update max annual_kwh
adfarth 2053ef9
Update Julia to registered v0.44.0
Bill-Becker a769763
Make outages test a delta of 1% LCC
Bill-Becker File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,13 @@ | ||
appEnv: staging | ||
djangoSettingsModule: reopt_api.staging_settings | ||
djangoReplicas: 3 | ||
djangoMemoryRequest: "2800Mi" | ||
djangoMemoryLimit: "2800Mi" | ||
celeryReplicas: 6 | ||
celeryMemoryRequest: "900Mi" | ||
celeryMemoryLimit: "900Mi" | ||
juliaReplicas: 6 | ||
juliaCpuRequest: "1000m" | ||
juliaCpuLimit: "4000m" | ||
juliaMemoryRequest: "8000Mi" | ||
juliaMemoryLimit: "8000Mi" | ||
juliaMemoryRequest: "12000Mi" | ||
juliaMemoryLimit: "12000Mi" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
reoptjl/migrations/0055_alter_settings_optimality_tolerance_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Generated by Django 4.0.7 on 2024-03-28 03:12 | ||
|
||
import django.core.validators | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reoptjl', '0054_rename_distance_to_emissions_region_meters_electricutilityoutputs_distance_to_avert_emissions_region'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='settings', | ||
name='optimality_tolerance', | ||
field=models.FloatField(default=0.001, help_text="The threshold for the difference between the solution's objective value and the best possible value at which the solver terminates", validators=[django.core.validators.MinValueValidator(5e-06), django.core.validators.MaxValueValidator(0.2)]), | ||
), | ||
migrations.AlterField( | ||
model_name='settings', | ||
name='solver_name', | ||
field=models.TextField(blank=True, choices=[('HiGHS', 'Highs'), ('Cbc', 'Cbc'), ('SCIP', 'Scip'), ('Xpress', 'Xpress')], default='HiGHS', help_text='Solver used for REopt.jl. Options include HiGHS, Cbc, SCIP, and Xpress'), | ||
), | ||
migrations.AlterField( | ||
model_name='settings', | ||
name='timeout_seconds', | ||
field=models.IntegerField(default=600, help_text='The number of seconds allowed before the optimization times out.', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1200)]), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see no harm in going higher for API users, like 3600 as the max - since harder problems might need more time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be fine with a larger timeout for local/other-server running the API, but I don't want to clog up the NREL servers with super-long running runs. That's actually the main motivation for keeping this reasonably low.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense to me! Thanks for clarifying.