Skip to content

Commit 3f06a58

Browse files
authored
[iOS][Android] Fix mobile flow after recent refactor (#3334)
This PR fixes the iOS and Android build flow after recent mainline TVM refactors. Particularly, the include path for dlpack is updated, and for iOS we now link to `libtvm_ffi_static`.
1 parent 1e6cfcb commit 3f06a58

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

android/mlc4j/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ target_include_directories(
5757
PUBLIC ${JNI_INCLUDE_DIRS}
5858
${JNI_HEADER}
5959
${ANDROID_DIR}/src/cpp
60-
${TVM_SOURCE_DIR}/3rdparty/dlpack/include
60+
${TVM_SOURCE_DIR}/ffi/3rdparty/dlpack/include
6161
${TVM_SOURCE_DIR}/3rdparty/dmlc-core/include
6262
${TVM_SOURCE_DIR}/3rdparty/OpenCL-Headers
6363
${TVM_SOURCE_DIR}/3rdparty/picojson

ios/MLCChat/MLCChat.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@
433433
"-Wl,-all_load",
434434
"-lmodel_iphone",
435435
"-lmlc_llm",
436+
"-ltvm_ffi_static",
436437
"-ltvm_runtime",
437438
"-ltokenizers_cpp",
438439
"-lsentencepiece",
@@ -486,6 +487,7 @@
486487
"-Wl,-all_load",
487488
"-lmodel_iphone",
488489
"-lmlc_llm",
490+
"-ltvm_ffi_static",
489491
"-ltvm_runtime",
490492
"-ltokenizers_cpp",
491493
"-lsentencepiece",

ios/MLCSwift/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ let package = Package(
1919
cxxSettings: [
2020
.headerSearchPath("../../tvm_home/include"),
2121
.headerSearchPath("../../tvm_home/ffi/include"),
22-
.headerSearchPath("../../tvm_home/3rdparty/dmlc-core/include"),
23-
.headerSearchPath("../../tvm_home/3rdparty/dlpack/include")
22+
.headerSearchPath("../../tvm_home/ffi/3rdparty/dlpack/include"),
23+
.headerSearchPath("../../tvm_home/3rdparty/dmlc-core/include")
2424
]
2525
),
2626
.target(

0 commit comments

Comments
 (0)