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

Smarter solver #74

Merged
merged 46 commits into from
Mar 15, 2024
Merged

Smarter solver #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
9261239
first poc for speed improvment: not recomputing what does not need to…
BDonnot Oct 23, 2023
950a835
solving conflicts and implement logic in elements [skip ci]
BDonnot Dec 7, 2023
eba1aab
Merge branch 'bd-dev' into smarter_solver
BDonnot Dec 8, 2023
c5c85bb
now it compiles, need to check tests, and implement logic solver side…
BDonnot Dec 8, 2023
8334ef7
python calls updated, now need to solve the segfault [skip ci]
BDonnot Dec 8, 2023
cc25e53
compiles and basic checks work
BDonnot Dec 13, 2023
91939fd
let's see what tests fail now
BDonnot Dec 14, 2023
8bb7acd
let's see failing tests
BDonnot Dec 15, 2023
d37aa42
fixing some broken tests
BDonnot Dec 18, 2023
44cea30
huge renaming to clean src (cpp) repo
BDonnot Dec 18, 2023
94f707d
start systematic testing for solver control
BDonnot Dec 18, 2023
ca7dc71
adding more test for the solver control
BDonnot Dec 19, 2023
1d80160
improve testing for solver control
BDonnot Dec 21, 2023
4d13a26
completing the test suite
BDonnot Dec 21, 2023
d546f8b
fixing broken tests
BDonnot Dec 22, 2023
202a589
fixing some bugs for the batch powerflows
BDonnot Dec 22, 2023
cbe0b1b
refactor the MultiplePower to BatchPowerflow, ContingencyAnalysis and…
BDonnot Dec 22, 2023
b5646dd
fixing broken imports after renaming
BDonnot Jan 10, 2024
3ed4bad
adding support for more than 2 busbars per substation
BDonnot Mar 7, 2024
b465c2b
fixing bug in the benchmarking of grid size, improve solver control
BDonnot Mar 7, 2024
2bf5787
fixing some issues in the CI
BDonnot Mar 8, 2024
ab0c89c
some more fixes, and improved CI
BDonnot Mar 8, 2024
b95bd0c
debuging CI, a passion
BDonnot Mar 8, 2024
8734cbf
debuging CI, a passion
BDonnot Mar 8, 2024
6fa83dd
debuging CI, a passion
BDonnot Mar 8, 2024
85852a1
trying to fix CI yet again
BDonnot Mar 8, 2024
c02545c
trying to fix CI yet again
BDonnot Mar 8, 2024
0bdc52f
fix new parameters names in pypowsybl leading to broken tests
BDonnot Mar 11, 2024
f1992bf
some more fixes
BDonnot Mar 12, 2024
dc08f10
more robust implementation of copy
BDonnot Mar 14, 2024
2c8947d
fixing the previously bugy more robust implementation of copy
BDonnot Mar 14, 2024
a927c83
trying to fix the CI
BDonnot Mar 14, 2024
ac260ae
fixing the backend, trying to fix windows CI
BDonnot Mar 14, 2024
f2837b3
Backward compat with improved .copy() method
BDonnot Mar 14, 2024
1a231f3
trying to fix windows CI
BDonnot Mar 14, 2024
557cda6
backward compat with new grid2op tests
BDonnot Mar 14, 2024
1cf647d
trying to fix readthedocs
BDonnot Mar 14, 2024
6b8a10a
CI might pass again
BDonnot Mar 14, 2024
919eb64
tyring to fix test in DC powerflow
BDonnot Mar 14, 2024
af31a91
fixing read the doc
BDonnot Mar 14, 2024
b735f37
Merge pull request #75 from BDonnot/v0.7.5-branch
BDonnot Mar 14, 2024
ba0a99f
ready for version 0.8.0
BDonnot Mar 15, 2024
daf8a93
ready for version 0.8.0
BDonnot Mar 15, 2024
db3ef35
fixing some issues
BDonnot Mar 15, 2024
ffcb564
fixing some issues
BDonnot Mar 15, 2024
9bb7f7c
fix a bug introduced by refactoring
BDonnot Mar 15, 2024
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
155 changes: 132 additions & 23 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ orbs:


executors:
gcc_13:
docker:
- image: gcc:13
gcc_12:
docker:
- image: gcc:12
Expand All @@ -20,6 +23,18 @@ executors:
gcc_8:
docker:
- image: gcc:8
# clang18:
# docker:
# - image: silkeh/clang:18
clang17:
docker:
- image: silkeh/clang:17
clang16:
docker:
- image: silkeh/clang:16
clang15:
docker:
- image: silkeh/clang:15
clang14:
docker:
- image: silkeh/clang:14
Expand All @@ -40,17 +55,36 @@ executors:
- image: silkeh/clang:9 # no c++ 11, does not work

jobs:
compile_gcc12:
executor: gcc_12
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-full python3-dev python3-pip python3-virtualenv git -y
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
git submodule update
make
CC=gcc python setup.py build
python -m pip install -U .
compile_gcc11:
executor: gcc_11
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip -y
- run: apt-get update && apt-get install python3-pip python3-full -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
Expand All @@ -63,12 +97,13 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip -y
- run: apt-get update && apt-get install python3-pip python3-full -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
Expand All @@ -81,12 +116,13 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip -y
- run: apt-get update && apt-get install python3-pip python3-full -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
Expand All @@ -105,25 +141,27 @@ jobs:
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
git submodule update
make
CC=gcc python setup.py build
python -m pip install -U .
compile_gcc12:
executor: gcc_12
compile_gcc13:
executor: gcc_13
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip python3-virtualenv -y
- run: apt-get update && apt-get install python3-full python3-dev python3-pip python3-virtualenv git -y
# - run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
name: "Install grid2op from source"
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
git clone https://github.com/rte-france/grid2op.git _grid2op
pip install -e _grid2op
- run:
Expand All @@ -147,12 +185,13 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip -y
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U pybind11
git submodule init
git submodule update
Expand All @@ -164,7 +203,7 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip git -y
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run:
command: |
git submodule init
Expand All @@ -175,6 +214,7 @@ jobs:
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U pybind11
CC=clang python setup.py build
python -m pip install .
Expand All @@ -183,12 +223,13 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip git -y
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
Expand All @@ -201,12 +242,13 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip git -y
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
Expand All @@ -219,12 +261,13 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip git -y
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
Expand All @@ -237,13 +280,69 @@ jobs:
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip git -y
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
git submodule update
make
CC=clang python setup.py build
CC=clang python -m pip install -U .
compile_clang15:
executor: clang15
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-pip python3-full git -y
- run: python3 -m pip install virtualenv
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
git submodule update
make
CC=clang python setup.py build
CC=clang python -m pip install -U .
compile_clang16:
executor: clang16
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-full python3-dev python3-pip python3-virtualenv git -y
- run: python3 -m virtualenv venv_test
- run:
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
pip install -U grid2op
pip install -U pybind11
git submodule init
git submodule update
make
CC=clang python setup.py build
CC=clang python -m pip install -U .
compile_clang17:
executor: clang17
resource_class: small
steps:
- checkout
- run: apt-get update && apt-get install python3-full python3-dev python3-pip python3-virtualenv git -y
- run: python3 -m virtualenv venv_test
- run:
name: "Install grid2op from source"
command: |
source venv_test/bin/activate
pip install --upgrade pip setuptools wheel
git clone https://github.com/rte-france/grid2op.git _grid2op
pip install -e _grid2op
- run:
Expand All @@ -268,11 +367,17 @@ jobs:
size: medium # ("medium" "large" "xlarge" "2xlarge")
steps:
- checkout
# - run:
# name: "Install Python"
# command: choco install python --version=3.9 # use python 3.9 for windows test
- run: py -m pip install virtualenv
- run: py -m virtualenv venv_test
- run: choco install python --version=3.10 --force -y
- run: C:\Python310\python --version
- run: C:\Python310\python -m pip install --upgrade pip setuptools wheel
- run: C:\Python310\python -m pip install virtualenv
- run: C:\Python310\python -m virtualenv venv_test
- run:
name: "Chekc python / pip version in venv"
command: |
.\venv_test\Scripts\activate
python --version
pip --version
- run:
name: "Install grid2op from source"
command: |
Expand All @@ -286,8 +391,8 @@ jobs:
pip install -U pybind11
git submodule init
git submodule update
py setup.py build
py -m pip install -e .[test]
python setup.py build
python -m pip install -e .[test]
- run:
name: "make tests"
command: |
Expand All @@ -300,11 +405,15 @@ workflows:
compile:
jobs:
- compile_gcc8
- compile_gcc10
- compile_gcc11
# - compile_gcc10
# - compile_gcc11
- compile_gcc12
- compile_gcc13
# - compile_clang10 # does not work I don't know why, too lazy to check
- compile_clang11
- compile_clang13
- compile_clang14
# - compile_clang13
# - compile_clang14
# - compile_clang15
- compile_clang16
- compile_clang17
- compile_windows
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,3 +278,5 @@ lightsim2grid/tests/_grid2op_for_test/
bug_sparselu
bug_sparselu_eigen.cpp
test_segfault.sh
nohup.out
test_rte/
11 changes: 9 additions & 2 deletions .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
version: 2
version: "2"

submodules:
include:
- SuiteSparse
- eigen
recursive: true

build:
os: "ubuntu-22.04"
tools:
python: "3.10"

sphinx:
configuration: docs/conf.py

python:
version: 3.8
install:
- method: pip
path: .
Expand Down
Loading
Loading