From 1f6cb95c67701c14eb93301f6ea9470814935f07 Mon Sep 17 00:00:00 2001
From: agibsonccc <adam@konduit.ai>
Date: Tue, 9 Mar 2021 11:23:31 +0900
Subject: [PATCH] Update javacpp versions, deploy plugin

---
 .github/workflows/build-android-x86_64.yml    |  1 +
 .../workflows/build-deploy-android-arm32.yml  |  1 +
 .../workflows/build-deploy-android-arm64.yml  |  1 +
 .../workflows/build-deploy-linux-arm32.yml    |  1 +
 .../workflows/build-deploy-linux-arm64.yml    |  1 +
 .../build-deploy-linux-cuda-11.0.yml          |  1 +
 .../build-deploy-linux-cuda-11.2.yml          |  1 +
 .../workflows/build-deploy-linux-x86_64.yml   |  1 +
 .github/workflows/build-deploy-mac.yml        |  1 +
 .../build-deploy-windows-cuda-11.0.yml        |  1 +
 .../build-deploy-windows-cuda-11.2.yml        |  1 +
 .github/workflows/build-deploy-windows.yml    |  1 +
 .../nd4j-backend-impls/nd4j-cuda/pom.xml      | 36 ++++++++++++++++++
 .../nd4j-backend-impls/nd4j-native/pom.xml    | 38 +++++++++++++++++++
 nd4j/nd4j-onnxruntime/pom.xml                 |  2 +-
 pom.xml                                       |  2 +-
 16 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-android-x86_64.yml b/.github/workflows/build-android-x86_64.yml
index 9ae8120a2..b4e529203 100644
--- a/.github/workflows/build-android-x86_64.yml
+++ b/.github/workflows/build-android-x86_64.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   android-x86_64:
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/build-deploy-android-arm32.yml b/.github/workflows/build-deploy-android-arm32.yml
index 73e96ac0a..3f4a0fc04 100644
--- a/.github/workflows/build-deploy-android-arm32.yml
+++ b/.github/workflows/build-deploy-android-arm32.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   #Note: no -pl here because we publish everything from this branch and use this as the basis for all uploads.
   android-arm32:
diff --git a/.github/workflows/build-deploy-android-arm64.yml b/.github/workflows/build-deploy-android-arm64.yml
index 586806163..d2eba04ea 100644
--- a/.github/workflows/build-deploy-android-arm64.yml
+++ b/.github/workflows/build-deploy-android-arm64.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   #Note: no -pl here because we publish everything from this branch and use this as the basis for all uploads.
   android-arm64:
diff --git a/.github/workflows/build-deploy-linux-arm32.yml b/.github/workflows/build-deploy-linux-arm32.yml
index 90aafc1c4..88884aa5b 100644
--- a/.github/workflows/build-deploy-linux-arm32.yml
+++ b/.github/workflows/build-deploy-linux-arm32.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   #Note: no -pl here because we publish everything from this branch and use this as the basis for all uploads.
   linux-arm32:
diff --git a/.github/workflows/build-deploy-linux-arm64.yml b/.github/workflows/build-deploy-linux-arm64.yml
index f6090c52b..d806203ce 100644
--- a/.github/workflows/build-deploy-linux-arm64.yml
+++ b/.github/workflows/build-deploy-linux-arm64.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   #Note: no -pl here because we publish everything from this branch and use this as the basis for all uploads.
   linux-arm64:
diff --git a/.github/workflows/build-deploy-linux-cuda-11.0.yml b/.github/workflows/build-deploy-linux-cuda-11.0.yml
index cc179305d..1a559c01f 100644
--- a/.github/workflows/build-deploy-linux-cuda-11.0.yml
+++ b/.github/workflows/build-deploy-linux-cuda-11.0.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
 
   linux-x86_64-cuda_11-0:
diff --git a/.github/workflows/build-deploy-linux-cuda-11.2.yml b/.github/workflows/build-deploy-linux-cuda-11.2.yml
index 958b9e0e5..3387740eb 100644
--- a/.github/workflows/build-deploy-linux-cuda-11.2.yml
+++ b/.github/workflows/build-deploy-linux-cuda-11.2.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   linux-x86_64-cuda-11-2:
     runs-on: ubuntu-18.04
diff --git a/.github/workflows/build-deploy-linux-x86_64.yml b/.github/workflows/build-deploy-linux-x86_64.yml
index 6e9951dd9..33aea5c56 100644
--- a/.github/workflows/build-deploy-linux-x86_64.yml
+++ b/.github/workflows/build-deploy-linux-x86_64.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   #Note: no -pl here because we publish everything from this branch and use this as the basis for all uploads.
   linux-x86_64:
diff --git a/.github/workflows/build-deploy-mac.yml b/.github/workflows/build-deploy-mac.yml
index d21646bda..93bd3898e 100644
--- a/.github/workflows/build-deploy-mac.yml
+++ b/.github/workflows/build-deploy-mac.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   mac-x86_64:
     runs-on: macos-10.15
diff --git a/.github/workflows/build-deploy-windows-cuda-11.0.yml b/.github/workflows/build-deploy-windows-cuda-11.0.yml
index 1c1f53691..b2f61ed9a 100644
--- a/.github/workflows/build-deploy-windows-cuda-11.0.yml
+++ b/.github/workflows/build-deploy-windows-cuda-11.0.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   windows-x86_64-cuda-11-0:
     runs-on: windows-2019
diff --git a/.github/workflows/build-deploy-windows-cuda-11.2.yml b/.github/workflows/build-deploy-windows-cuda-11.2.yml
index d89ecfcec..8cd435732 100644
--- a/.github/workflows/build-deploy-windows-cuda-11.2.yml
+++ b/.github/workflows/build-deploy-windows-cuda-11.2.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
   windows-x86_64-cuda-11-2:
     runs-on: windows-2019
diff --git a/.github/workflows/build-deploy-windows.yml b/.github/workflows/build-deploy-windows.yml
index 5c7f1926d..51ad31e7e 100644
--- a/.github/workflows/build-deploy-windows.yml
+++ b/.github/workflows/build-deploy-windows.yml
@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron: "0 */12 * * *"
+  workflow_dispatch:
 jobs:
 
   windows-x86_64:
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
index b8a27a9f6..8ec975768 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
@@ -325,6 +325,42 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-deploy</id>
+                        <phase>none</phase>
+                    </execution>
+
+                    <execution>
+                        <id>java-classes</id>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <packaging>jar</packaging>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>${project.groupId}</groupId>
+                            <version>${project.version}</version>
+                            <sources>${project.build.directory}/nd4j-cuda-${cuda.version}-${project.version}.jar</sources>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>native-deps</id>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <packaging>jar</packaging>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>${project.groupId}</groupId>
+                            <version>${project.version}</version>
+                            <classifier>${javacpp.platform}</classifier>
+                            <sources>${project.build.directory}/nd4j-cuda-${cuda.version}-${project.version}-${javacpp.platform}.jar</sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
index 45ebcd12b..a53bc5128 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
@@ -261,6 +261,44 @@
                     </execution>
                 </executions>
             </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-deploy</id>
+                        <phase>none</phase>
+                    </execution>
+
+                    <execution>
+                        <id>java-classes</id>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <packaging>jar</packaging>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>${project.groupId}</groupId>
+                            <version>${project.version}</version>
+                            <sources>${project.build.directory}/nd4j-native-${project.version}.jar</sources>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>native-deps</id>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <packaging>jar</packaging>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>${project.groupId}</groupId>
+                            <version>${project.version}</version>
+                            <classifier>${javacpp.platform}</classifier>
+                            <sources>${project.build.directory}/nd4j-native-${project.version}-${javacpp.platform}.jar</sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
diff --git a/nd4j/nd4j-onnxruntime/pom.xml b/nd4j/nd4j-onnxruntime/pom.xml
index e4b99e283..013d87616 100644
--- a/nd4j/nd4j-onnxruntime/pom.xml
+++ b/nd4j/nd4j-onnxruntime/pom.xml
@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <onnxruntime.version>1.6.0</onnxruntime.version>
+        <onnxruntime.version>1.7.0</onnxruntime.version>
         <onnxruntime.javacpp.version>${onnxruntime.version}-${javacpp.version}</onnxruntime.javacpp.version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index b4211a167..0b5dd873f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,7 @@
         <openblas.version>0.3.13</openblas.version>
         <mkl.version>2021.1</mkl.version>
         <opencv.version>4.5.1</opencv.version>
-        <ffmpeg.version>4.3.1</ffmpeg.version>
+        <ffmpeg.version>4.3.2</ffmpeg.version>
         <leptonica.version>1.80.0</leptonica.version>
         <hdf5.version>1.12.0</hdf5.version>
         <ale.version>0.6.1</ale.version>