* Bundle configuration files required by AOT compilation with GraalV…

…M (issue deeplearning4j/deeplearning4j#7362)
bytedeco · Jun 9, 2020 · d6e5ec7 · d6e5ec7
1 parent 0d3d6da
commit d6e5ec7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Bundle configuration files required by AOT compilation with GraalVM ([issue eclipse/deeplearning4j#7362](https://github.com/eclipse/deeplearning4j/issues/7362))
  * Add support for Windows to presets for Qt ([issue #862](https://github.com/bytedeco/javacpp-presets/issues/862))
  * Fix JPMS modules for CUDA, ARPACK-NG, GSL, SciPy, Gym, MXNet ([pull #880](https://github.com/bytedeco/javacpp-presets/pull/880) and [pull #881](https://github.com/bytedeco/javacpp-presets/pull/881))
  * Build OpenBLAS with a `TARGET` even for `DYNAMIC_ARCH` to avoid SIGILL ([issue eclipse/deeplearning4j#8747](https://github.com/eclipse/deeplearning4j/issues/8747))

diff --git a/cppbuild.sh b/cppbuild.sh
@@ -76,7 +76,7 @@ while [[ $# > 0 ]]; do
     shift
 done
 
-echo -n "Building for platform \"$PLATFORM\""
+echo -n "Building platform \"$PLATFORM\""
 if [[ -n "$EXTENSION" ]]; then
     echo -n " with extension \"$EXTENSION\""
 fi

diff --git a/cuda/pom.xml b/cuda/pom.xml
@@ -46,6 +46,7 @@
               <classifier>${javacpp.platform}</classifier>
               <includes>
                 <include>org/bytedeco/cuda/${javacpp.platform}/*jni*</include>
+                <include>META-INF/native-image/${javacpp.platform}/</include>
               </includes>
             </configuration>
           </execution>
@@ -60,6 +61,7 @@
               <classesDirectory>${project.build.directory}/native</classesDirectory>
               <includes>
                 <include>org/bytedeco/cuda/${javacpp.platform}/</include>
+                <include>META-INF/native-image/${javacpp.platform}/</include>
               </includes>
               <excludes>
                 <exclude>org/bytedeco/cuda/${javacpp.platform}/*jni*</exclude>

diff --git a/mkl/pom.xml b/mkl/pom.xml
@@ -46,6 +46,7 @@
               <classifier>${javacpp.platform}</classifier>
               <includes>
                 <include>org/bytedeco/mkl/${javacpp.platform}/*jni*</include>
+                <include>META-INF/native-image/${javacpp.platform}/</include>
               </includes>
             </configuration>
           </execution>
@@ -60,6 +61,7 @@
               <classesDirectory>${project.build.directory}/native</classesDirectory>
               <includes>
                 <include>org/bytedeco/mkl/${javacpp.platform}/</include>
+                <include>META-INF/native-image/${javacpp.platform}/</include>
               </includes>
               <excludes>
                 <exclude>org/bytedeco/mkl/${javacpp.platform}/*jni*</exclude>

diff --git a/pom.xml b/pom.xml
@@ -298,6 +298,7 @@
               <classOrPackageName>org.bytedeco.${javacpp.packageName}.**</classOrPackageName>
               <copyLibs>true</copyLibs>
               <copyResources>true</copyResources>
+              <configDirectory>${project.build.directory}/native/META-INF/native-image/${javacpp.platform}${javacpp.platform.extension}/</configDirectory>
             </configuration>
           </execution>
         </executions>
@@ -351,6 +352,7 @@
                      without cleaning, ensures we only include files for
                      this platform. -->
                 <include>${javacpp.platform.nativeOutputPath}/</include>
+                <include>META-INF/native-image/${javacpp.platform}${javacpp.platform.extension}/</include>
               </includes>
               <archive>
                 <manifestEntries>

diff --git a/tensorrt/pom.xml b/tensorrt/pom.xml
@@ -64,6 +64,7 @@
               <classifier>${javacpp.platform}</classifier>
               <includes>
                 <include>org/bytedeco/tensorrt/${javacpp.platform}/*jni*</include>
+                <include>META-INF/native-image/${javacpp.platform}/</include>
               </includes>
             </configuration>
           </execution>
@@ -78,6 +79,7 @@
               <classesDirectory>${project.build.directory}/native</classesDirectory>
               <includes>
                 <include>org/bytedeco/tensorrt/${javacpp.platform}/</include>
+                <include>META-INF/native-image/${javacpp.platform}/</include>
               </includes>
               <excludes>
                 <exclude>org/bytedeco/tensorrt/${javacpp.platform}/*jni*</exclude>