Skip to content

Commit 6ae45b6

Browse files
committed
[REFACTOR][FFI] Split tvm-ffi into a separate repo
This PR updates the code so we split tvm-ffi into a separate repo
1 parent 5ddc5bc commit 6ae45b6

File tree

194 files changed

+103
-37831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+103
-37831
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ runs:
3939
- name: Install tvm-ffi pip package
4040
shell: bash -l {0}
4141
run: |
42-
pip install -v ./ffi
42+
pip install -v ./3rdparty/tvm-ffi

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@
2828
[submodule "ffi/3rdparty/dlpack"]
2929
path = ffi/3rdparty/dlpack
3030
url = https://github.com/dmlc/dlpack.git
31+
[submodule "3rdparty/tvm-ffi"]
32+
path = 3rdparty/tvm-ffi
33+
url = https://github.com/apache/tvm-ffi

3rdparty/tvm-ffi

Submodule tvm-ffi added at 3e07df4

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ if(USE_IOS_RPC)
567567
add_subdirectory("apps/ios_rpc")
568568
endif()
569569

570-
add_subdirectory(ffi)
570+
add_subdirectory(3rdparty/tvm-ffi)
571571

572572
if(TVM_DEBUG_WITH_ABI_CHANGE)
573573
message(STATUS "Building with debug code that may cause ABI changes...")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ LOCAL_SRC_FILES := org_apache_tvm_native_c_api.cc
3737
LOCAL_LDFLAGS := -L$(SYSROOT)/usr/lib/ -llog
3838

3939
LOCAL_C_INCLUDES := $(ROOT_PATH)/include \
40-
$(ROOT_PATH)/ffi/include \
41-
$(ROOT_PATH)/ffi/3rdparty/dlpack/include \
40+
$(ROOT_PATH)/3rdparty/tvm-ffi/include \
41+
$(ROOT_PATH)/3rdparty/tvm-ffi/3rdparty/dlpack/include \
4242
$(ROOT_PATH)/3rdparty/dmlc-core/include \
4343
$(ROOT_PATH)/3rdparty/OpenCL-Headers
4444

apps/android_rpc/app/src/main/jni/tvm_runtime.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434
#define TVM_LOG_CUSTOMIZE 1
3535
#define TVM_FFI_USE_LIBBACKTRACE 0
3636

37-
#include "../ffi/src/ffi/container.cc"
38-
#include "../ffi/src/ffi/dtype.cc"
39-
#include "../ffi/src/ffi/error.cc"
40-
#include "../ffi/src/ffi/extra/library_module.cc"
41-
#include "../ffi/src/ffi/extra/library_module_dynamic_lib.cc"
42-
#include "../ffi/src/ffi/extra/library_module_system_lib.cc"
43-
#include "../ffi/src/ffi/extra/module.cc"
44-
#include "../ffi/src/ffi/extra/testing.cc"
45-
#include "../ffi/src/ffi/function.cc"
46-
#include "../ffi/src/ffi/object.cc"
47-
#include "../ffi/src/ffi/tensor.cc"
48-
#include "../ffi/src/ffi/traceback.cc"
37+
#include "../3rdparty/tvm-ffi/src/ffi/container.cc"
38+
#include "../3rdparty/tvm-ffi/src/ffi/dtype.cc"
39+
#include "../3rdparty/tvm-ffi/src/ffi/error.cc"
40+
#include "../3rdparty/tvm-ffi/src/ffi/extra/library_module.cc"
41+
#include "../3rdparty/tvm-ffi/src/ffi/extra/library_module_dynamic_lib.cc"
42+
#include "../3rdparty/tvm-ffi/src/ffi/extra/library_module_system_lib.cc"
43+
#include "../3rdparty/tvm-ffi/src/ffi/extra/module.cc"
44+
#include "../3rdparty/tvm-ffi/src/ffi/extra/testing.cc"
45+
#include "../3rdparty/tvm-ffi/src/ffi/function.cc"
46+
#include "../3rdparty/tvm-ffi/src/ffi/object.cc"
47+
#include "../3rdparty/tvm-ffi/src/ffi/tensor.cc"
48+
#include "../3rdparty/tvm-ffi/src/ffi/traceback.cc"
4949
#include "../src/runtime/cpu_device_api.cc"
5050
#include "../src/runtime/device_api.cc"
5151
#include "../src/runtime/file_utils.cc"

apps/ios_rpc/tvmrpc/TVMRuntime.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#if defined(USE_CUSTOM_DSO_LOADER) && USE_CUSTOM_DSO_LOADER == 1
3535
// internal TVM header to achieve Library class
36-
#include <../../../ffi/src/ffi/extra/library_module.h>
36+
#include <../../../3rdparty/tvm-ffi/src/ffi/extra/library_module.h>
3737
#include <custom_dlfcn.h>
3838
#endif
3939

docs/install/from_source.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Therefore, after we finish the build, we need to install the tvm-ffi package.
135135

136136
.. code-block:: bash
137137
138-
cd ffi; pip install .; cd ..
138+
cd 3rdparty/tvm-ffi; pip install .; cd ..
139139
140140
141141
Leaving the build environment ``tvm-build-venv``, there are two ways to install the successful build into your environment:

ffi/.clang-format

Lines changed: 0 additions & 8 deletions
This file was deleted.

ffi/CMakeLists.txt

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)