From 4d2df4eb8c27a4e3167adf6f3871eadeb5604735 Mon Sep 17 00:00:00 2001 From: Yaliang Wu Date: Wed, 21 Dec 2022 22:36:05 +0000 Subject: [PATCH 1/2] bump djl to 0.20 and add onnxruntime-gpu dependency (#644) Signed-off-by: Yaliang Wu Signed-off-by: Yaliang Wu --- ml-algorithms/build.gradle | 7 +++++-- plugin/build.gradle | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle index 1516cae170..fa7c5054ae 100644 --- a/ml-algorithms/build.gradle +++ b/ml-algorithms/build.gradle @@ -33,11 +33,14 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0' testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.4.0' implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - implementation platform("ai.djl:bom:0.19.0") + implementation platform("ai.djl:bom:0.20.0") implementation group: 'ai.djl.pytorch', name: 'pytorch-model-zoo' implementation group: 'ai.djl', name: 'api' - implementation group: 'ai.djl.onnxruntime', name: 'onnxruntime-engine' implementation group: 'ai.djl.huggingface', name: 'tokenizers' + implementation("ai.djl.onnxruntime:onnxruntime-engine:0.20.0") { + exclude group: "com.microsoft.onnxruntime", module: "onnxruntime" + } + implementation "com.microsoft.onnxruntime:onnxruntime_gpu:1.13.1" } configurations.all { diff --git a/plugin/build.gradle b/plugin/build.gradle index 3409bdacaa..4e67c5eec9 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}") implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.10' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0' From 4b693e26d13b1780203a8b3a933a3a79384254a6 Mon Sep 17 00:00:00 2001 From: Sicheng Song <114637679+b4sjoo@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:34:17 -0800 Subject: [PATCH 2/2] Remove jackson-databind and jackson-annotations dependencies now coming from core (#652) Signed-off-by: Yaliang Wu --- plugin/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index 4e67c5eec9..10837ea301 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -44,8 +44,6 @@ dependencies { implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" implementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}" implementation "org.opensearch:common-utils:${common_utils_version}" - implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") - implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}") implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' implementation group: 'com.google.code.gson', name: 'gson', version: '2.10' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'