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

[WIP] GraalVM JDK 22 #669

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open

[WIP] GraalVM JDK 22 #669

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
248d927
GraalVM JDK 21
geofjamg Oct 27, 2023
9fda9c1
Wip
geofjamg Oct 27, 2023
0adb2ca
Wip
geofjamg Oct 27, 2023
139e2de
Wip
geofjamg Oct 27, 2023
65bba7f
Wip
geofjamg Nov 1, 2023
970136d
Wip
geofjamg Nov 1, 2023
6f80e05
Wip
geofjamg Nov 2, 2023
9966bf2
Wip
geofjamg Nov 2, 2023
7469bf7
Wip
geofjamg Nov 2, 2023
1dd696d
Wip
geofjamg Nov 2, 2023
11c7d1a
Merge branch 'main' into graalvm_jdk21
geofjamg Feb 22, 2024
46f4ec9
Merge branch 'main' into graalvm_jdk21
geofjamg May 14, 2024
d32afa3
Merge branch 'main' into graalvm_jdk21
geofjamg Jun 24, 2024
2eb0e2a
Merge
geofjamg Jun 24, 2024
947af39
Edge info displayed (#773)
unetablettedechocolat Jun 26, 2024
d605170
remove deprecated attributes in network modification functions (#732)
colinepiloquet Jun 26, 2024
6c2002a
add Sld parameters in doc (#775)
unetablettedechocolat Jun 26, 2024
ba28c19
Upgrade to PowSyBl 2024.1.2 (#783)
geofjamg Jun 26, 2024
6f652f9
Clean doc setup (#784)
geofjamg Jun 26, 2024
ca23cfd
CI should fail in case of doc generation warnings (#787)
geofjamg Jun 26, 2024
260fc95
Remove debug prints (#788)
geofjamg Jun 26, 2024
3901818
Add support of dc_power_factor Load Flow Parameter (#756)
jeandemanged Jul 1, 2024
432b597
Fix CI manylinux (#794)
jeandemanged Jul 1, 2024
c326d29
Add DanglingLine boundary side P, Q, Vmag, Vangle (#792)
jeandemanged Jul 1, 2024
6cf3c61
adding documentation for reduce function (#791)
EtienneLt Jul 2, 2024
293d066
Add get_matrix_multi_substation_single_line_diagram (#781)
unetablettedechocolat Jul 2, 2024
212530c
Bump to v1.6.0
HugoKulesza Jul 2, 2024
462e81a
Bump to v1.7.0-SNAPSHOT
HugoKulesza Jul 2, 2024
9548e88
Adding current feeder info parameter for SLD (#785)
unetablettedechocolat Jul 8, 2024
c066f58
Fix CI : regain compatibility with node16 for the CI (#798)
HugoKulesza Jul 9, 2024
597cddf
Fix Windows CI : set matplotlib to 3.9.0 for python > 3.8 (#801)
HugoKulesza Jul 11, 2024
f25270c
Fix MSVC runtime binaries incompatibility issues (#803)
obrix Jul 15, 2024
d80e776
Do not use a constructor triggering a c++ call from within a default …
obrix Jul 16, 2024
146e4e1
Fix multi substation sld svg (#797)
CBiasuzzi Jul 16, 2024
ece090e
add documentation for hvdc lines (#805)
EtienneLt Jul 16, 2024
076162e
Rename enum related to ampl logging (#812)
obrix Jul 30, 2024
493dbdc
Make pairing key of dangling lines updatable (#811)
colinepiloquet Jul 30, 2024
eb1661e
Display units feeder info (#799)
unetablettedechocolat Jul 31, 2024
e3fd8f2
Allows empty strings in the multi-substation SLD functions' matrix pa…
CBiasuzzi Jul 31, 2024
21c71f8
Add initial voltage plan parameter for short-circuit analysis (#809)
colinepiloquet Jul 31, 2024
f822389
Add attribute "paired" for dangling lines (#815)
EtienneLt Aug 6, 2024
0e337eb
Update
geofjamg Aug 24, 2024
9ea80ab
Merge branch 'main' into graalvm_jdk21
geofjamg Aug 24, 2024
5b6be19
Wip
geofjamg Aug 24, 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
4 changes: 2 additions & 2 deletions .github/workflows/dev-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17'
java-version: '21'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17'
java-version: '21'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/full-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17'
java-version: '21'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
java-version: '17'
java-version: '21'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Requirements:
- C++11 compiler
- Python >= 3.7 for Linux, Windows and MacOS amd64
- Python >= 3.8 for MacOS arm64
- [Oracle GraalVM Java 17](https://www.graalvm.org/downloads/)
- [Oracle GraalVM Java 21](https://www.graalvm.org/downloads/)

To build from sources and install PyPowSyBl package:

Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ExternalProject_Add(native-image
DEPENDS mvn
SOURCE_DIR ${PYPOWSYBL_JAVA_BIN_DIR}
DOWNLOAD_COMMAND ""
PATCH_COMMAND $ENV{JAVA_HOME}/bin/native-image ${NATIVE_IMAGE_BUILD_OPTIONS} --class-path ${PYPOWSYBL_JAVA_SRC_DIR}/target/pypowsybl-java.jar${EXTRA_JARS} -march=compatibility --no-fallback --shared --gc=${NATIVE_IMAGE_GC} -H:Name=pypowsybl-java -H:CLibraryPath=${CMAKE_CURRENT_SOURCE_DIR}/src
PATCH_COMMAND $ENV{JAVA_HOME}/bin/native-image ${NATIVE_IMAGE_BUILD_OPTIONS} --class-path ${PYPOWSYBL_JAVA_SRC_DIR}/target/pypowsybl-java.jar${EXTRA_JARS} -march=compatibility --no-fallback --shared --gc=${NATIVE_IMAGE_GC} -o pypowsybl-java -H:CLibraryPath=${CMAKE_CURRENT_SOURCE_DIR}/src
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${PYPOWSYBL_JAVA_BIN_DIR}/${PYPOWSYBL_JAVA_OLD_LIB} ${PYPOWSYBL_JAVA_BIN_DIR}/${PYPOWSYBL_JAVA_LIB} ${NATIVE_IMAGE_INSTALL_EXTRA_COMMAND}
Expand Down
6 changes: 3 additions & 3 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
<version>1.1.0-SNAPSHOT</version>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem with maven version ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will revert this to 17 in this pr to keep java 17 source compatibility, even using jdk 21

<commons-collections4.version>4.4</commons-collections4.version>
<graalvm.version>23.0.0</graalvm.version>
<graalvm.version>23.1.1</graalvm.version>
<janino.version>3.1.0</janino.version>
<junit-jupiter.version>5.5.2</junit-jupiter.version>
<mapdb.version>3.0.8</mapdb.version>
Expand Down Expand Up @@ -188,7 +188,7 @@
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<artifactId>nativeimage</artifactId>
<version>${graalvm.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Loading