Remove javah support (#10104)

* Remove javah support * Remove unused compiler option * Osx pom.xml update
apache · Feb 3, 2022 · 9518b7e · 9518b7e
1 parent f929b0f
commit 9518b7e
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 45 deletions.
diff --git a/apps/android_camera/app/src/main/jni/build.sh b/apps/android_camera/app/src/main/jni/build.sh
@@ -19,7 +19,8 @@ set -x
 PATH="$PATH:/usr/local/bin"
 CURR_DIR=$(cd `dirname $0`; pwd)
 ROOT_DIR="$CURR_DIR/../../../../../.."
-javah -o $CURR_DIR/org_apache_tvm_native_c_api.h -cp "$ROOT_DIR/jvm/core/target/*" org.apache.tvm.LibInfo || exit -1
+javac -h $CURR_DIR -classpath "$ROOT_DIR/jvm/core/target/*" $ROOT_DIR/jvm/core/src/main/java/org/apache/tvm/LibInfo.java || exit -1
+mv $CURR_DIR/org_apache_tvm_LibInfo.h $CURR_DIR/org_apache_tvm_native_c_api.h
 cp -f $ROOT_DIR/jvm/native/src/main/native/org_apache_tvm_native_c_api.cc $CURR_DIR/ || exit -1
 cp -f $ROOT_DIR/jvm/native/src/main/native/jni_helper_func.h $CURR_DIR/ || exit -1
 rm -rf $CURR_DIR/../libs

diff --git a/apps/android_deploy/app/src/main/jni/build.sh b/apps/android_deploy/app/src/main/jni/build.sh
@@ -18,7 +18,8 @@
 PATH="$PATH:/usr/local/bin"
 CURR_DIR=$(cd `dirname $0`; pwd)
 ROOT_DIR="$CURR_DIR/../../../../../.."
-javah -o $CURR_DIR/org_apache_tvm_native_c_api.h -cp "$ROOT_DIR/jvm/core/target/*" org.apache.tvm.LibInfo || exit -1
+javac -h $CURR_DIR -classpath "$ROOT_DIR/jvm/core/target/*" $ROOT_DIR/jvm/core/src/main/java/org/apache/tvm/LibInfo.java || exit -1
+mv $CURR_DIR/org_apache_tvm_LibInfo.h $CURR_DIR/org_apache_tvm_native_c_api.h
 cp -f $ROOT_DIR/jvm/native/src/main/native/org_apache_tvm_native_c_api.cc $CURR_DIR/ || exit -1
 cp -f $ROOT_DIR/jvm/native/src/main/native/jni_helper_func.h $CURR_DIR/ || exit -1
 rm -rf $CURR_DIR/../libs

diff --git a/apps/android_rpc/app/src/main/jni/build.sh b/apps/android_rpc/app/src/main/jni/build.sh
@@ -18,7 +18,8 @@
 PATH="$PATH:/usr/local/bin"
 CURR_DIR=$(cd `dirname $0`; pwd)
 ROOT_DIR="$CURR_DIR/../../../../../.."
-javah -o $CURR_DIR/org_apache_tvm_native_c_api.h -cp "$ROOT_DIR/jvm/core/target/*" org.apache.tvm.LibInfo || exit -1
+javac -h $CURR_DIR -classpath "$ROOT_DIR/jvm/core/target/*" $ROOT_DIR/jvm/core/src/main/java/org/apache/tvm/LibInfo.java || exit -1
+mv $CURR_DIR/org_apache_tvm_LibInfo.h $CURR_DIR/org_apache_tvm_native_c_api.h
 cp -f $ROOT_DIR/jvm/native/src/main/native/org_apache_tvm_native_c_api.cc $CURR_DIR/ || exit -1
 cp -f $ROOT_DIR/jvm/native/src/main/native/jni_helper_func.h $CURR_DIR/ || exit -1
 rm -rf $CURR_DIR/../libs

diff --git a/jvm/native/linux-x86_64/pom.xml b/jvm/native/linux-x86_64/pom.xml
@@ -48,18 +48,59 @@ under the License.
   </dependencies>
 
   <build>
+    <sourceDirectory>${basedir}/../../core/src/main/java</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>header-generation</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <compilerArgs>
+                <arg>-h</arg>
+                <arg>${basedir}/generated</arg>
+                <arg>-classpath</arg>
+                <arg>${project.build.directory}/classes:${project.build.directory}/../../../core/tvm4j-core-0.0.1-SNAPSHOT.jar</arg>/
+              </compilerArgs>
+              <includes>
+                <include>org/apache/tvm/LibInfo.java</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
 
+<!--      Rename and move generated 'org_apache_tvm_LibInfo.h' to 'org_apache_tvm_native_c_api.h'-->
+      <plugin>
+      <artifactId>maven-antrun-plugin</artifactId>
+      <version>1.7</version>
+      <executions>
+        <execution>
+          <id>copy-header</id>
+          <phase>process-sources</phase>
+          <configuration>
+            <target>
+              <copy file="${basedir}/generated/org_apache_tvm_LibInfo.h"
+                    tofile="${basedir}/../src/main/native/org_apache_tvm_native_c_api.h" />
+            </target>
+          </configuration>
+          <goals>
+            <goal>run</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>native-maven-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <!--  trigger javah -->
           <javahOS>linux</javahOS>
           <compilerProvider>generic-classic</compilerProvider>
           <compilerExecutable>${cxx}</compilerExecutable>
@@ -77,6 +118,8 @@ under the License.
           </compilerStartOptions>
           <compilerEndOptions>
             <compilerEndOption>-I../../../include</compilerEndOption>
+            <compilerEndOption>-I${JAVA_HOME}/include</compilerEndOption>
+            <compilerEndOption>-I${JAVA_HOME}/include/linux</compilerEndOption>
             <compilerEndOption>${cflags}</compilerEndOption>
           </compilerEndOptions>
           <linkerStartOptions>
@@ -86,26 +129,6 @@ under the License.
             <linkerEndOption>${ldflags}</linkerEndOption>
           </linkerEndOptions>
         </configuration>
-
-        <executions>
-          <execution>
-            <id>javah</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <javahOS>linux</javahOS>
-              <javahProvider>default</javahProvider>
-              <javahOutputDirectory>${project.build.directory}/custom-javah</javahOutputDirectory>
-              <workingDirectory>${basedir}</workingDirectory>
-              <javahOutputFileName>org_apache_tvm_native_c_api.h</javahOutputFileName>
-              <javahClassNames>
-                <javahClassName>org.apache.tvm.LibInfo</javahClassName>
-              </javahClassNames>
-            </configuration>
-            <goals>
-              <goal>javah</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>

diff --git a/jvm/native/osx-x86_64/pom.xml b/jvm/native/osx-x86_64/pom.xml
@@ -48,10 +48,52 @@ under the License.
   </dependencies>
 
   <build>
+    <sourceDirectory>${basedir}/../../core/src/main/java</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>header-generation</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <compilerArgs>
+                <arg>-h</arg>
+                <arg>${basedir}/generated</arg>
+                <arg>-classpath</arg>
+                <arg>${project.build.directory}/classes:${project.build.directory}/../../../core/tvm4j-core-0.0.1-SNAPSHOT.jar</arg>/
+              </compilerArgs>
+              <includes>
+                <include>org/apache/tvm/LibInfo.java</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--      Rename and move generated 'org_apache_tvm_LibInfo.h' to 'org_apache_tvm_native_c_api.h'-->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>copy-header</id>
+            <phase>process-sources</phase>
+            <configuration>
+              <target>
+                <copy file="${basedir}/generated/org_apache_tvm_LibInfo.h"
+                      tofile="${basedir}/../src/main/native/org_apache_tvm_native_c_api.h" />
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -77,6 +119,8 @@ under the License.
           </compilerStartOptions>
           <compilerEndOptions>
             <compilerEndOption>-I../../../include</compilerEndOption>
+            <compilerEndOption>-I${JAVA_HOME}/include</compilerEndOption>
+            <compilerEndOption>-I${JAVA_HOME}/include/linux</compilerEndOption
             <compilerEndOption>${cflags}</compilerEndOption>
           </compilerEndOptions>
           <linkerStartOptions>
@@ -92,26 +136,6 @@ under the License.
             <linkerEndOption>${ldflags}</linkerEndOption>
           </linkerEndOptions>
         </configuration>
-
-        <executions>
-          <execution>
-            <id>javah</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <javahOS>darwin</javahOS>
-              <javahProvider>default</javahProvider>
-              <javahOutputDirectory>${project.build.directory}/custom-javah</javahOutputDirectory>
-              <workingDirectory>${basedir}</workingDirectory>
-              <javahOutputFileName>org_apache_tvm_native_c_api.h</javahOutputFileName>
-              <javahClassNames>
-                <javahClassName>org.apache.tvm.LibInfo</javahClassName>
-              </javahClassNames>
-            </configuration>
-            <goals>
-              <goal>javah</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>

diff --git a/jvm/native/src/main/native/org_apache_tvm_native_c_api.cc b/jvm/native/src/main/native/org_apache_tvm_native_c_api.cc
@@ -20,7 +20,7 @@
  * \file org_apache_tvm_native_c_api.cc
  * \brief tvm4j jni source file
  */
-#include "org_apache_tvm_native_c_api.h"  // generated by javah
+#include "org_apache_tvm_native_c_api.h"  // generated by javac
 #ifdef TVM4J_ANDROID
 #include "tvm_runtime.h"
 #else