From e22a2c93ff993eb602c84a8f5c140d39e92b6d5e Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Fri, 23 Aug 2019 17:21:38 +0900 Subject: [PATCH] Update docs for Android and CUDA/cuDNN Signed-off-by: Samuel Audet --- .../templates/android-image-classification.md | 30 +++++++++---------- .../templates/android-linear-classifier.md | 30 +++++++++---------- .../templates/android-prerequisites.md | 30 +++++++++---------- docs/deeplearning4j/templates/android.md | 30 +++++++++---------- docs/deeplearning4j/templates/config-cudnn.md | 10 +++---- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/docs/deeplearning4j/templates/android-image-classification.md b/docs/deeplearning4j/templates/android-image-classification.md index 537f25cb5..1295a641b 100644 --- a/docs/deeplearning4j/templates/android-image-classification.md +++ b/docs/deeplearning4j/templates/android-image-classification.md @@ -40,21 +40,21 @@ compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', cla compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-arm64" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5' -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5' -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5' -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1' +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1' +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1' +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86_64" implementation 'com.google.code.gson:gson:2.8.2' annotationProcessor 'org.projectlombok:lombok:1.16.16' diff --git a/docs/deeplearning4j/templates/android-linear-classifier.md b/docs/deeplearning4j/templates/android-linear-classifier.md index a9424149f..8eb6632c3 100644 --- a/docs/deeplearning4j/templates/android-linear-classifier.md +++ b/docs/deeplearning4j/templates/android-linear-classifier.md @@ -36,21 +36,21 @@ compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', cla compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-arm64" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5' -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5' -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5' -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1' +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1' +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1' +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86_64" ``` Compiling these dependencies involves a large number of files, thus it is necessary to set multiDexEnabled to true in defaultConfig. diff --git a/docs/deeplearning4j/templates/android-prerequisites.md b/docs/deeplearning4j/templates/android-prerequisites.md index c7b55c14d..9028533dd 100644 --- a/docs/deeplearning4j/templates/android-prerequisites.md +++ b/docs/deeplearning4j/templates/android-prerequisites.md @@ -44,21 +44,21 @@ compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', cla compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-arm64" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5' -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5' -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5' -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1' +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1' +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1' +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86_64" testCompile 'junit:junit:4.12' ``` diff --git a/docs/deeplearning4j/templates/android.md b/docs/deeplearning4j/templates/android.md index 66aaa6a81..f97c966c1 100644 --- a/docs/deeplearning4j/templates/android.md +++ b/docs/deeplearning4j/templates/android.md @@ -47,21 +47,21 @@ compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', cla compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-arm64" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86" compile group: 'org.nd4j', name: 'nd4j-native', version: '{{page.version}}', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5' -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5' -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'opencv', version: '4.0.1-1.5', classifier: "android-x86_64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5' -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-arm64" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86" -compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1' +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'openblas', version: '0.3.6-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1' +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'opencv', version: '4.1.0-1.5.1', classifier: "android-x86_64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1' +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-arm64" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86" +compile group: 'org.bytedeco', name: 'leptonica', version: '1.78.0-1.5.1', classifier: "android-x86_64" ``` diff --git a/docs/deeplearning4j/templates/config-cudnn.md b/docs/deeplearning4j/templates/config-cudnn.md index 9b89ef264..e58b864db 100644 --- a/docs/deeplearning4j/templates/config-cudnn.md +++ b/docs/deeplearning4j/templates/config-cudnn.md @@ -50,7 +50,7 @@ Note there are multiple combinations of cuDNN and CUDA supported. At this time t 9.27.2 10.07.4 - 10.17.5 + 10.17.6 @@ -61,25 +61,25 @@ Alternatively, in the case of CUDA 10.1, cuDNN comes bundled with the "redist" p org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.6-1.5.1 linux-x86_64-redist org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.6-1.5.1 linux-ppc64le-redist org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.6-1.5.1 macosx-x86_64-redist org.bytedeco cuda - 10.1-7.5-1.5 + 10.1-7.6-1.5.1 windows-x86_64-redist