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

Extend TornadoVM installer script with SapMachine OpenJDK 21 and Microsoft OpenJDK 21 #390

Merged
merged 3 commits into from
Apr 24, 2024
Merged

Extend TornadoVM installer script with SapMachine OpenJDK 21 and Microsoft OpenJDK 21 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e26cebc
[feat] Add configuration links for SapMachine JDK support in the inst…
stratika Apr 24, 2024
c5807d4
[feat] Update configuration links for Microsoft JDK in the installer
stratika Apr 24, 2024
f1b01b9
[fix] Update label for Microsoft JDK configuration
stratika Apr 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
31 changes: 23 additions & 8 deletions bin/installer_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
__GRAALVM21__ = "graalvm-jdk-21"
__MANDREL21__ = "mandrel-jdk-21"
__CORRETTO21__ = "corretto-jdk-21"
__MICROSOFT20__ = "microsoft-jdk-20"
__MICROSOFT21__ = "microsoft-jdk-21"
__ZULU21__ = "zulu-jdk-21"
__TEMURIN21__ = "temurin-jdk-21"
__SAPMACHINE21__ = "sapmachine-jdk-21"

## cmake
CMAKE = {
Expand Down Expand Up @@ -124,18 +125,18 @@
__ARM__: None,
},
},
__MICROSOFT20__: {
__MICROSOFT21__: {
__LINUX__: {
__X86_64__: None,
__ARM__: None,
__X86_64__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-linux-x64.tar.gz",
__ARM__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-linux-aarch64.tar.gz",
},
__APPLE__: {
__X86_64__: None,
__ARM__: None,
__X86_64__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-macos-x64.tar.gz",
__ARM__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-macos-aarch64.tar.gz",
},
__WINDOWS__: {
__X86_64__: None,
__ARM__: None,
__X86_64__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-windows-x64.zip",
__ARM__: "https://aka.ms/download-jdk/microsoft-jdk-21.0.3-windows-aarch64.zip",
},
},
__ZULU21__: {
Expand Down Expand Up @@ -166,4 +167,18 @@
__ARM__: None,
},
},
__SAPMACHINE21__: {
__LINUX__: {
__X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_linux-x64_bin.tar.gz",
__ARM__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_linux-aarch64_bin.tar.gz",
},
__APPLE__: {
__X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_macos-x64_bin.tar.gz",
__ARM__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_macos-aarch64_bin.tar.gz",
},
__WINDOWS__: {
__X86_64__: "https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_windows-x64_bin.zip",
__ARM__: None,
},
},
}
17 changes: 10 additions & 7 deletions bin/tornadovm-installer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ __SUPPORTED_JDKS__ = [
config.__JDK21__,
config.__GRAALVM21__,
config.__CORRETTO21__,
config.__MICROSOFT20__,
config.__MICROSOFT21__,
config.__MANDREL21__,
config.__ZULU21__,
config.__TEMURIN21__,
config.__SAPMACHINE21__,
]

__SUPPORTED_BACKENDS__ = ["opencl", "spirv", "ptx"]
Expand Down Expand Up @@ -344,12 +345,14 @@ def listSupportedJDKs():
"""
TornadoVM Installer - Select a JDK implementation to install with TornadoVM:

jdk21 : Install TornadoVM with OpenJDK 21 (Oracle OpenJDK)
graal-jdk-21 : Install TornadoVM with GraalVM and JDK 21 (GraalVM 23.1.0)
mandrel-jdk-21 : Install TornadoVM with Mandrel and JDK 21 (GraalVM 23.1.0)
corretto-jdk-21 : Install TornadoVM with Corretto JDK 21
zulu-jdk-21 : Install TornadoVM with Azul Zulu JDK 21
temurin-jdk-21 : Install TornadoVM with Eclipse Temurin JDK 21
jdk21 : Install TornadoVM with OpenJDK 21 (Oracle OpenJDK)
graal-jdk-21 : Install TornadoVM with GraalVM and JDK 21 (GraalVM 23.1.0)
mandrel-jdk-21 : Install TornadoVM with Mandrel and JDK 21 (GraalVM 23.1.0)
corretto-jdk-21 : Install TornadoVM with Corretto JDK 21
microsoft-jdk-21 : Install TornadoVM with Microsoft JDK 21
zulu-jdk-21 : Install TornadoVM with Azul Zulu JDK 21
temurin-jdk-21 : Install TornadoVM with Eclipse Temurin JDK 21
sapmachine-jdk-21 : Install TornadoVM with SapMachine OpenJDK 21

Usage:
$ ./bin/tornadovm-installer --jdk <JDK_VERSION> --backend <BACKEND>
Expand Down