diff --git a/.github/workflows/native_jni_s3_pytorch.yml b/.github/workflows/native_jni_s3_pytorch.yml index 43e68ec5e33b..58e896b5cda7 100644 --- a/.github/workflows/native_jni_s3_pytorch.yml +++ b/.github/workflows/native_jni_s3_pytorch.yml @@ -39,8 +39,8 @@ jobs: aws-region: us-east-2 - name: Copy files to S3 with the AWS CLI run: | - aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.8.1/jnilib - aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.8.1/jnilib*" + aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.9.0/jnilib + aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.9.0/jnilib*" build-pytorch-jni-linux-gpu: if: github.repository == 'deepjavalibrary/djl' @@ -78,8 +78,8 @@ jobs: aws-region: us-east-2 - name: Copy files to S3 with the AWS CLI run: | - aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.8.1/jnilib - aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.8.1/jnilib*" + aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.9.0/jnilib + aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.9.0/jnilib*" build-pytorch-jni-precxx11: if: github.repository == 'deepjavalibrary/djl' @@ -116,8 +116,8 @@ jobs: aws-region: us-east-2 - name: Copy files to S3 with the AWS CLI run: | - aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.8.1/jnilib/precxx11 - aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.8.1/jnilib/precxx11*" + aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.9.0/jnilib/precxx11 + aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.9.0/jnilib/precxx11*" build-pytorch-jni-windows-gpu: if: github.repository == 'deepjavalibrary/djl' @@ -170,5 +170,5 @@ jobs: aws-region: us-east-2 - name: Copy files to S3 with the AWS CLI run: | - aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.8.1/jnilib - aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.8.1/jnilib*" + aws s3 sync pytorch/pytorch-native/jnilib s3://djl-ai/publish/pytorch-1.9.0/jnilib + aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.9.0/jnilib*" diff --git a/.github/workflows/native_jni_s3_pytorch_android.yml b/.github/workflows/native_jni_s3_pytorch_android.yml index 4dedd2d86f89..2f436591fd01 100644 --- a/.github/workflows/native_jni_s3_pytorch_android.yml +++ b/.github/workflows/native_jni_s3_pytorch_android.yml @@ -52,5 +52,5 @@ jobs: aws-region: us-east-2 - name: Copy files to S3 with the AWS CLI run: | - aws s3 sync jnilib s3://djl-ai/publish/pytorch-1.8.1/jnilib - aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.8.1/jnilib*" + aws s3 sync jnilib s3://djl-ai/publish/pytorch-1.9.0/jnilib + aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/pytorch-1.9.0/jnilib*" diff --git a/.github/workflows/native_s3_pytorch_android.yml b/.github/workflows/native_s3_pytorch_android.yml index c32a6315e5f3..50936722c44e 100644 --- a/.github/workflows/native_s3_pytorch_android.yml +++ b/.github/workflows/native_s3_pytorch_android.yml @@ -10,8 +10,8 @@ jobs: matrix: format: ["armeabi-v7a", "arm64-v8a", "x86" ,"x86_64"] env: - PYTORCH_TAG_VERSION: "v1.8.1" - PYTORCH_VERSION: "1.8.1" + PYTORCH_TAG_VERSION: "v1.9.0" + PYTORCH_VERSION: "1.9.0" NDK_VERSION: "20.0.5594570" steps: - uses: actions/checkout@v1 diff --git a/dlr/dlr-engine/build.gradle b/dlr/dlr-engine/build.gradle index 084e4becae66..99144e93fce7 100644 --- a/dlr/dlr-engine/build.gradle +++ b/dlr/dlr-engine/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation "org.slf4j:slf4j-simple:${slf4j_version}" testRuntimeOnly project(":pytorch:pytorch-engine") testRuntimeOnly "ai.djl.dlr:dlr-native-auto:${dlr_version}" - testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" + testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}-SNAPSHOT" } processResources { diff --git a/examples/build.gradle b/examples/build.gradle index 223e538b00ec..dd39a606f973 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -10,7 +10,7 @@ dependencies { if (System.getProperty("ai.djl.default_engine") == "PyTorch") { runtimeOnly project(":pytorch:pytorch-model-zoo") - runtimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" + runtimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}-SNAPSHOT" } else if (System.getProperty("ai.djl.default_engine") == "TensorFlow") { // javacpp bug fix https://github.com/bytedeco/javacpp/commit/7f27899578dfa18e22738a3dd49701e1806b464a runtimeOnly "org.bytedeco:javacpp:1.5.6-SNAPSHOT" diff --git a/gradle.properties b/gradle.properties index 0f7916574700..dcd9e578c12a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true djl_version=0.12.0 mxnet_version=1.8.0 -pytorch_version=1.8.1 +pytorch_version=1.9.0 tensorflow_version=2.4.1 tflite_version=2.4.1 dlr_version=1.6.0 diff --git a/integration/build.gradle b/integration/build.gradle index 2edfb4423e62..210ae01bf893 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -16,7 +16,7 @@ dependencies { runtimeOnly project(":mxnet:mxnet-model-zoo") runtimeOnly "ai.djl.mxnet:mxnet-native-auto:${mxnet_version}" runtimeOnly project(":pytorch:pytorch-model-zoo") - runtimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" + runtimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}-SNAPSHOT" runtimeOnly project(":tensorflow:tensorflow-model-zoo") runtimeOnly "ai.djl.tensorflow:tensorflow-native-auto:${tensorflow_version}" diff --git a/ml/xgboost/build.gradle b/ml/xgboost/build.gradle index a7c178f490b5..a8a1eb980c67 100644 --- a/ml/xgboost/build.gradle +++ b/ml/xgboost/build.gradle @@ -30,8 +30,6 @@ dependencies { exclude group: "junit", module: "junit" } -// testRuntimeOnly project(":pytorch:pytorch-engine") -// testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" testRuntimeOnly "org.slf4j:slf4j-simple:${slf4j_version}" } diff --git a/onnxruntime/onnxruntime-engine/build.gradle b/onnxruntime/onnxruntime-engine/build.gradle index eddd249f73c0..9c53748e6714 100644 --- a/onnxruntime/onnxruntime-engine/build.gradle +++ b/onnxruntime/onnxruntime-engine/build.gradle @@ -8,8 +8,6 @@ dependencies { exclude group: "junit", module: "junit" } - // testRuntimeOnly project(":pytorch:pytorch-engine") - // testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" testRuntimeOnly "org.slf4j:slf4j-simple:${slf4j_version}" } diff --git a/paddlepaddle/paddlepaddle-model-zoo/build.gradle b/paddlepaddle/paddlepaddle-model-zoo/build.gradle index 79bcc1988676..4abf3eb6f87d 100644 --- a/paddlepaddle/paddlepaddle-model-zoo/build.gradle +++ b/paddlepaddle/paddlepaddle-model-zoo/build.gradle @@ -8,7 +8,7 @@ dependencies { exclude group: "junit", module: "junit" } testImplementation "org.slf4j:slf4j-simple:${slf4j_version}" - testRuntimeOnly "ai.djl.paddlepaddle:paddlepaddle-native-auto:${paddlepaddle_version}" + testRuntimeOnly "ai.djl.paddlepaddle:paddlepaddle-native-auto:${paddlepaddle_version}-SNAPSHOT" testRuntimeOnly project(":pytorch:pytorch-engine") testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" } diff --git a/pytorch/pytorch-engine/build.gradle b/pytorch/pytorch-engine/build.gradle index 216b9fada05b..3b70af1aeb4f 100644 --- a/pytorch/pytorch-engine/build.gradle +++ b/pytorch/pytorch-engine/build.gradle @@ -8,7 +8,7 @@ dependencies { } testImplementation "org.slf4j:slf4j-simple:${slf4j_version}" testRuntimeOnly project(":pytorch:pytorch-model-zoo") - testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" + testRuntimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}-SNAPSHOT" } processResources { diff --git a/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java b/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java index 9f8598fe3496..4a77978d01db 100644 --- a/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java +++ b/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java @@ -93,7 +93,7 @@ public int getRank() { /** {@inheritDoc} */ @Override public String getVersion() { - return "1.8.1"; + return "1.9.0"; } /** {@inheritDoc} */ diff --git a/pytorch/pytorch-native/build.cmd b/pytorch/pytorch-native/build.cmd index 9fd8f95ef13f..cf52f3c91fa9 100644 --- a/pytorch/pytorch-native/build.cmd +++ b/pytorch/pytorch-native/build.cmd @@ -5,7 +5,7 @@ @rem choco install jdk8 -y set FILEPATH="libtorch" -set VERSION="1.8.1" +set VERSION="1.9.0" if "%1" == "cpu" ( set DOWNLOAD_URL="https://download.pytorch.org/libtorch/cpu/libtorch-win-shared-with-deps-%VERSION%%%2Bcpu.zip" ) else if "%1" == "cu102" ( diff --git a/pytorch/pytorch-native/build.gradle b/pytorch/pytorch-native/build.gradle index ece9ad697520..4c23341e027d 100644 --- a/pytorch/pytorch-native/build.gradle +++ b/pytorch/pytorch-native/build.gradle @@ -6,7 +6,7 @@ plugins { group = "ai.djl.pytorch" apply from: file("${rootProject.projectDir}/tools/gradle/cpp-formatter.gradle") -def VERSION = "1.8.1" +def VERSION = "1.9.0" boolean isRelease = project.hasProperty("release") || project.hasProperty("staging") boolean isPrecxx11 = project.hasProperty("precxx11") boolean isGPU = project.hasProperty("gpu") diff --git a/pytorch/pytorch-native/build.sh b/pytorch/pytorch-native/build.sh index 0b5f67281337..15ef200623ea 100755 --- a/pytorch/pytorch-native/build.sh +++ b/pytorch/pytorch-native/build.sh @@ -11,7 +11,7 @@ elif [[ -n $(command -v sysctl) ]]; then fi PLATFORM=$(uname | tr '[:upper:]' '[:lower:]') -VERSION=1.8.1 +VERSION=1.9.0 CXX11ABI="-cxx11-abi" if [[ $2 == "precxx11" ]]; then CXX11ABI="" @@ -19,9 +19,7 @@ fi if [[ ! -d "libtorch" ]]; then if [[ $PLATFORM == 'linux' ]]; then - if [[ $1 == "cpu" ]] || [[ $1 == "cu111" ]]; then - curl -s https://download.pytorch.org/libtorch/${1}/libtorch${CXX11ABI}-shared-with-deps-${VERSION}%2B${1}.zip | jar xv - elif [[ $1 == "cu102" ]]; then + if [[ $1 == "cpu" ]] || [[ $1 == "cu111" ]] || [[ $1 == "cu102" ]]; then curl -s https://download.pytorch.org/libtorch/${1}/libtorch${CXX11ABI}-shared-with-deps-${VERSION}%2B${1}.zip | jar xv else echo "$1 is not supported." diff --git a/pytorch/pytorch-native/build_android.sh b/pytorch/pytorch-native/build_android.sh index b5a8b57dfb69..e337c8019f66 100644 --- a/pytorch/pytorch-native/build_android.sh +++ b/pytorch/pytorch-native/build_android.sh @@ -10,7 +10,7 @@ elif [[ -n $(command -v sysctl) ]]; then NUM_PROC=$(sysctl -n hw.ncpu) fi -VERSION=1.8.1 +VERSION=1.9.0 if [[ ! -d libtorch_android/"$1" ]]; then if [[ $1 != "armeabi-v7a" ]] && [[ $1 != "arm64-v8a" ]] && [[ $1 != "x86" ]] && [[ $1 != "x86_64" ]]; then echo "$1 is not supported." diff --git a/serving/serving/build.gradle b/serving/serving/build.gradle index 432a05bcea26..037c7240da83 100644 --- a/serving/serving/build.gradle +++ b/serving/serving/build.gradle @@ -16,7 +16,7 @@ dependencies { runtimeOnly project(':pytorch:pytorch-model-zoo') runtimeOnly "ai.djl.mxnet:mxnet-native-auto:${mxnet_version}" - runtimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}" + runtimeOnly "ai.djl.pytorch:pytorch-native-auto:${pytorch_version}-SNAPSHOT" runtimeOnly "ai.djl.tensorflow:tensorflow-native-auto:${tensorflow_version}" testImplementation("org.testng:testng:${testng_version}") {