[ci] Uses recommended way to create task in build.gradle (#2451)

deepjavalibrary · Mar 9, 2023 · abe5d86 · abe5d86
1 parent bbd0777
commit abe5d86
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 36 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -27,6 +27,6 @@ allprojects {
     apply from: file("${rootProject.projectDir}/../tools/gradle/android-formatter.gradle")
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/pytorch-native/build.gradle b/android/pytorch-native/build.gradle
@@ -101,7 +101,7 @@ afterEvaluate {
 }
 
 
-task processResources {
+tasks.register('processResources') {
     doLast {
         def url = "https://publish.djl.ai/pytorch/${pytorch_version}/jnilib/${djl_version}/android"
         def abis = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]

diff --git a/basicdataset/build.gradle b/basicdataset/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     testImplementation project(":engines:pytorch:pytorch-engine")
 }
 
-task syncS3(type: Exec) {
+tasks.register('syncS3', Exec) {
     commandLine "sh", "-c", "find . -name .DS_Store | xargs rm && aws s3 sync src/test/resources/mlrepo s3://djl-ai/mlrepo --acl public-read"
 
     standardOutput = new ByteArrayOutputStream()

diff --git a/engines/mxnet/mxnet-engine/build.gradle b/engines/mxnet/mxnet-engine/build.gradle
@@ -30,7 +30,8 @@ processResources {
 checkstyleMain.source = 'src/main/java'
 pmdMain.source = 'src/main/java'
 
-task jnarator(dependsOn: ":engines:mxnet:jnarator:jar") {
+tasks.register('jnarator') {
+    dependsOn ":engines:mxnet:jnarator:jar"
     outputs.dir "${project.buildDir}/generated-src"
     doLast {
         File jnaGenerator = project(":engines:mxnet:jnarator").jar.outputs.files.singleFile
@@ -72,7 +73,7 @@ def checkForUpdate(String path, String url) {
     }
 }
 
-task checkHeaderFile() {
+tasks.register('checkHeaderFile') {
     outputs.files "${project.buildDir}/mxnet_c_api.h", "${project.buildDir}/nnvm_c_api.h"
     doFirst {
         if (gradle.startParameter.offline) {

diff --git a/engines/mxnet/mxnet-model-zoo/build.gradle b/engines/mxnet/mxnet-model-zoo/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
 }
 
-task syncS3(type: Exec) {
+tasks.register('syncS3', Exec) {
     commandLine "sh", "-c", "find . -name .DS_Store | xargs rm && aws s3 sync src/test/resources/mlrepo s3://djl-ai/mlrepo --acl public-read"
 
     standardOutput = new ByteArrayOutputStream()

diff --git a/engines/mxnet/native/build.gradle b/engines/mxnet/native/build.gradle
@@ -166,7 +166,7 @@ publishing.repositories {
 
 import java.util.zip.GZIPInputStream
 
-task downloadMxnetNativeLib() {
+tasks.register('downloadMxnetNativeLib') {
     doLast {
         def url = "https://publish.djl.ai/mxnet-${VERSION}"
         def files = [

diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/build.gradle b/engines/paddlepaddle/paddlepaddle-model-zoo/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testRuntimeOnly project(":engines:pytorch:pytorch-jni")
 }
 
-task syncS3(type: Exec) {
+tasks.register('syncS3', Exec) {
     commandLine "sh", "-c", "find . -name .DS_Store | xargs rm && aws s3 sync src/test/resources/mlrepo s3://djl-ai/mlrepo --acl public-read"
 
     standardOutput = new ByteArrayOutputStream()

diff --git a/engines/paddlepaddle/paddlepaddle-native/build.gradle b/engines/paddlepaddle/paddlepaddle-native/build.gradle
@@ -31,7 +31,7 @@ def downloadBuild(String os, String flavor) {
     }
 }
 
-task compileJNI {
+tasks.register('compileJNI') {
     doFirst {
         if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains("windows")) {
             downloadBuild("win", "cpu")
@@ -48,7 +48,7 @@ task compileJNI {
     }
 }
 
-task prepareNativeLibs() {
+tasks.register('prepareNativeLibs') {
     doLast {
         delete "${buildDir}/native"
 
@@ -112,7 +112,7 @@ task prepareNativeLibs() {
     }
 }
 
-task uploadS3 {
+tasks.register('uploadS3') {
     doLast {
         exec {
             commandLine "sh", "-c", "find ${buildDir}/native -type f | xargs gzip"

diff --git a/engines/pytorch/pytorch-model-zoo/build.gradle b/engines/pytorch/pytorch-model-zoo/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
 }
 
-task syncS3(type: Exec) {
+tasks.register('syncS3', Exec) {
     commandLine "sh", "-c", "find . -name .DS_Store | xargs rm && aws s3 sync src/test/resources/mlrepo s3://djl-ai/mlrepo --acl public-read"
 
     standardOutput = new ByteArrayOutputStream()

diff --git a/engines/pytorch/pytorch-native/build.gradle b/engines/pytorch/pytorch-native/build.gradle
@@ -165,13 +165,13 @@ def copyNativeLibToOutputDir(Map<String, String> fileStoreMap, String binaryRoot
     }
 }
 
-task compileAndroidJNI {
+tasks.register('compileAndroidJNI') {
     doFirst {
         downloadBuildAndroid("${VERSION}")
     }
 }
 
-task cleanJNI() {
+tasks.register('cleanJNI') {
     doFirst {
         delete "${project.projectDir}/build"
         delete "${project.projectDir}/libtorch"
@@ -180,7 +180,7 @@ task cleanJNI() {
     }
 }
 
-task compileJNI {
+tasks.register('compileJNI') {
     doFirst {
         // You have to use an environment with CUDA persets for Linux and Windows
         if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains("windows")) {
@@ -260,13 +260,13 @@ publishing.repositories {
     }
 }
 
-task downloadPyTorchNativeLib() {
+tasks.register('downloadPyTorchNativeLib') {
     doLast {
         prepareNativeLib("${BINARY_ROOT}", "${VERSION}")
     }
 }
 
-task uploadS3 {
+tasks.register('uploadS3') {
     doLast {
         delete "${BINARY_ROOT}"
         prepareNativeLib("${BINARY_ROOT}", "${VERSION}")

diff --git a/engines/tensorflow/tensorflow-model-zoo/build.gradle b/engines/tensorflow/tensorflow-model-zoo/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
 }
 
-task syncS3(type: Exec) {
+tasks.register('syncS3', Exec) {
     commandLine "sh", "-c", "find . -name .DS_Store | xargs rm && aws s3 sync src/test/resources/mlrepo s3://djl-ai/mlrepo --acl public-read"
 
     standardOutput = new ByteArrayOutputStream()

diff --git a/engines/tensorflow/tensorflow-native/build.gradle b/engines/tensorflow/tensorflow-native/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     download "org.tensorflow:tensorflow-core-api:0.5.0:windows-x86_64-gpu"
 }
 
-task uploadTensorflowNativeLibs() {
+tasks.register('uploadTensorflowNativeLibs') {
     doLast {
         delete "${buildDir}/download"
         delete "${buildDir}/native"
@@ -230,7 +230,7 @@ publishing.repositories {
 
 import java.util.zip.GZIPInputStream
 
-task downloadTensorflowNativeLib() {
+tasks.register('downloadTensorflowNativeLib') {
     doLast {
         def url = "https://publish.djl.ai/tensorflow-${tensorflow_version}"
         def files = [

diff --git a/engines/tensorrt/build.gradle b/engines/tensorrt/build.gradle
@@ -80,7 +80,7 @@ def buildJNI(String os) {
     }
 }
 
-task compileJNI {
+tasks.register('compileJNI') {
     doFirst {
         if (System.properties['os.name'].startsWith("Linux")) {
             buildJNI("linux")

diff --git a/engines/tflite/tflite-native/build.gradle b/engines/tflite/tflite-native/build.gradle
@@ -88,14 +88,14 @@ def downloadJni(String dir) {
     }
 }
 
-task downloadTfliteNativeLib() {
+tasks.register('downloadTfliteNativeLib') {
     doLast {
         delete "${BINARY_ROOT}"
         downloadJni("${BINARY_ROOT}")
     }
 }
 
-task uploadS3 {
+tasks.register('uploadS3') {
     doLast {
         delete "${BINARY_ROOT}"
         downloadJni("${BINARY_ROOT}")

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -49,7 +49,7 @@ run {
     systemProperty("file.encoding", "UTF-8")
 }
 
-task listmodels(type: JavaExec) {
+tasks.register('listmodels', JavaExec) {
     systemProperties System.getProperties()
     systemProperties.remove("user.dir")
     systemProperty("file.encoding", "UTF-8")

diff --git a/extensions/fasttext/build.gradle b/extensions/fasttext/build.gradle
@@ -56,7 +56,7 @@ publishing {
 
 apply from: file("${rootProject.projectDir}/tools/gradle/cpp-formatter.gradle")
 
-task compileJNI {
+tasks.register('compileJNI') {
     doFirst {
         if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains("mac")
                 || System.properties['os.name'].toLowerCase(Locale.ROOT).contains("linux")) {

diff --git a/extensions/sentencepiece/build.gradle b/extensions/sentencepiece/build.gradle
@@ -57,7 +57,7 @@ publishing {
 
 apply from: file("${rootProject.projectDir}/tools/gradle/cpp-formatter.gradle")
 
-task compileJNI {
+tasks.register('compileJNI') {
     doFirst {
         if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains("win")) {
             exec {

diff --git a/extensions/spark/build.gradle b/extensions/spark/build.gradle
@@ -21,7 +21,7 @@ compileScala {
     scalaCompileOptions.setAdditionalParameters(["-target:jvm-1.8"])
 }
 
-task formatPython {
+tasks.register('formatPython') {
     doFirst {
         exec {
             commandLine "bash", "-c", "find . -name '*.py' -print0 | xargs -0 yapf --in-place"

diff --git a/extensions/tokenizers/build.gradle b/extensions/tokenizers/build.gradle
@@ -84,7 +84,7 @@ publishing {
 
 apply from: file("${rootProject.projectDir}/tools/gradle/cpp-formatter.gradle")
 
-task compileJNI {
+tasks.register('compileJNI') {
     doFirst {
         if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains("mac")
                 || System.properties['os.name'].toLowerCase(Locale.ROOT).contains("linux")) {
@@ -108,7 +108,7 @@ task compileJNI {
     }
 }
 
-task formatPython {
+tasks.register('formatPython') {
     doFirst {
         exec {
             commandLine "bash", "-c", "find . -name '*.py' -print0 | xargs -0 yapf --in-place"

diff --git a/integration/build.gradle b/integration/build.gradle
@@ -33,7 +33,7 @@ java {
     }
 }
 
-task copyDependencies(type: Copy) {
+tasks.register('copyDependencies', Copy) {
     into "build/dependencies"
     from configurations.runtimeClasspath
 }
@@ -50,7 +50,7 @@ run {
     jvmArgs "-Xverify:none"
 }
 
-task debugEnv(type: JavaExec) {
+tasks.register('debugEnv', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     systemProperties System.getProperties()
     systemProperties.remove("user.dir")

diff --git a/model-zoo/build.gradle b/model-zoo/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
 }
 
-task syncS3(type: Exec) {
+tasks.register('syncS3', Exec) {
     commandLine "sh", "-c", "find . -name .DS_Store | xargs rm && aws s3 sync src/test/resources/mlrepo s3://djl-ai/mlrepo --acl public-read"
 
     standardOutput = new ByteArrayOutputStream()

diff --git a/tools/gradle/release.gradle b/tools/gradle/release.gradle
@@ -1,4 +1,4 @@
-task release {
+tasks.register('release') {
     doLast {
         def collection = fileTree("jupyter").filter { it.name.endsWith(".ipynb") }
         collection += files("examples/build.gradle", "examples/pom.xml")
@@ -8,7 +8,7 @@ task release {
     }
 }
 
-task staging() {
+tasks.register('staging') {
     doLast {
         if (!project.hasProperty("stagingRepo")) {
             throw new GradleException("stagingRepo property is required.")
@@ -26,7 +26,7 @@ task staging() {
     }
 }
 
-task increaseBuildVersion {
+tasks.register('increaseBuildVersion') {
     doLast {
         if (!project.hasProperty("targetVersion")) {
             throw new GradleException("targetVersion property is required.")
@@ -48,7 +48,7 @@ task increaseBuildVersion {
     }
 }
 
-task increaseFinalVersion {
+tasks.register('increaseFinalVersion') {
     doLast {
         if (!project.hasProperty("previousVersion")) {
             throw new GradleException("previousVersion property is required.")