misc fixes

Author: tqchen

.github/workflows/main.yml

@@ -49,22 +49,22 @@ jobs:
         run: >-
           conda build --output-folder=conda/pkg  conda/recipe &&
           conda install tvm -c ./conda/pkg
-      - name: Build iOS RPC
-        run: |
-          IOS_VERSION="14.0"
-          CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Release \
-                       -DCMAKE_SYSTEM_NAME=iOS \
-                       -DCMAKE_SYSTEM_VERSION=${IOS_VERSION} \
-                       -DCMAKE_OSX_SYSROOT=iphonesimulator \
-                       -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-                       -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
-                       -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
-                       -DUSE_IOS_RPC=ON"
-
-          mkdir build-ios-simulator
-          cd build-ios-simulator
-          cmake .. ${CMAKE_FLAGS}
-          cmake --build . --target ios_rpc
+#      - name: Build iOS RPC
+#        run: |
+#          IOS_VERSION="14.0"
+#          CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Release \
+#                       -DCMAKE_SYSTEM_NAME=iOS \
+#                       -DCMAKE_SYSTEM_VERSION=${IOS_VERSION} \
+#                       -DCMAKE_OSX_SYSROOT=iphonesimulator \
+#                       -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+#                       -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
+#                       -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
+#                       -DUSE_IOS_RPC=ON"
+#
+#          mkdir build-ios-simulator
+#          cd build-ios-simulator
+#          cmake .. ${CMAKE_FLAGS}
+#          cmake --build . --target ios_rpc
       - name: Test
         shell: bash -l {0}
         run: >-

apps/android_rpc/app/src/main/jni/Android.mk

@@ -37,7 +37,8 @@ LOCAL_SRC_FILES := org_apache_tvm_native_c_api.cc
 LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib/ -llog
 
 LOCAL_C_INCLUDES := $(ROOT_PATH)/include \
-                    $(ROOT_PATH)/3rdparty/dlpack/include \
+                    $(ROOT_PATH)/ffi/include \
+                    $(ROOT_PATH)/ffi/3rdparty/dlpack/include \
                     $(ROOT_PATH)/3rdparty/dmlc-core/include \
                     $(ROOT_PATH)/3rdparty/OpenCL-Headers
 

ffi/src/ffi/traceback_win.cc

@@ -122,7 +122,7 @@ std::string Traceback() {
 }  // namespace ffi
 }  // namespace tvm
 
-const TVMFFIByteArray* TVMFFITraceback() {
+const TVMFFIByteArray* TVMFFITraceback(const char* filename, int lineno, const char* func) {
   static thread_local std::string traceback_str;
   static thread_local TVMFFIByteArray traceback_array;
   traceback_str = ::tvm::ffi::Traceback();

jvm/native/linux-x86_64/pom.xml

@@ -118,6 +118,7 @@ under the License.
           </compilerStartOptions>
           <compilerEndOptions>
             <compilerEndOption>-I../../../include</compilerEndOption>
+            <compilerEndOption>-I../../../ffi/include</compilerEndOption>
             <compilerEndOption>-I${JAVA_HOME}/include</compilerEndOption>
             <compilerEndOption>-I${JAVA_HOME}/include/linux</compilerEndOption>
             <compilerEndOption>${cflags}</compilerEndOption>

jvm/native/osx-x86_64/pom.xml

@@ -119,6 +119,7 @@ under the License.
           </compilerStartOptions>
           <compilerEndOptions>
             <compilerEndOption>-I../../../include</compilerEndOption>
+            <compilerEndOption>-I../../../ffi/include</compilerEndOption>
             <compilerEndOption>-I${JAVA_HOME}/include</compilerEndOption>
             <compilerEndOption>-I${JAVA_HOME}/include/darwin</compilerEndOption>
             <compilerEndOption>${cflags}</compilerEndOption>