Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ runs:
- name: Install tvm-ffi pip package
shell: bash -l {0}
run: |
pip install -v ./ffi
pip install -v ./3rdparty/tvm-ffi
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@
[submodule "ffi/3rdparty/dlpack"]
path = ffi/3rdparty/dlpack
url = https://github.com/dmlc/dlpack.git
[submodule "3rdparty/tvm-ffi"]
path = 3rdparty/tvm-ffi
url = https://github.com/apache/tvm-ffi
1 change: 1 addition & 0 deletions 3rdparty/tvm-ffi
Submodule tvm-ffi added at 3e07df
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ if(USE_IOS_RPC)
add_subdirectory("apps/ios_rpc")
endif()

add_subdirectory(ffi)
add_subdirectory(3rdparty/tvm-ffi)

if(TVM_DEBUG_WITH_ABI_CHANGE)
message(STATUS "Building with debug code that may cause ABI changes...")
Expand Down
4 changes: 2 additions & 2 deletions apps/android_rpc/app/src/main/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +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)/ffi/include \
$(ROOT_PATH)/ffi/3rdparty/dlpack/include \
$(ROOT_PATH)/3rdparty/tvm-ffi/include \
$(ROOT_PATH)/3rdparty/tvm-ffi/3rdparty/dlpack/include \
$(ROOT_PATH)/3rdparty/dmlc-core/include \
$(ROOT_PATH)/3rdparty/OpenCL-Headers

Expand Down
24 changes: 12 additions & 12 deletions apps/android_rpc/app/src/main/jni/tvm_runtime.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
#define TVM_LOG_CUSTOMIZE 1
#define TVM_FFI_USE_LIBBACKTRACE 0

#include "../ffi/src/ffi/container.cc"
#include "../ffi/src/ffi/dtype.cc"
#include "../ffi/src/ffi/error.cc"
#include "../ffi/src/ffi/extra/library_module.cc"
#include "../ffi/src/ffi/extra/library_module_dynamic_lib.cc"
#include "../ffi/src/ffi/extra/library_module_system_lib.cc"
#include "../ffi/src/ffi/extra/module.cc"
#include "../ffi/src/ffi/extra/testing.cc"
#include "../ffi/src/ffi/function.cc"
#include "../ffi/src/ffi/object.cc"
#include "../ffi/src/ffi/tensor.cc"
#include "../ffi/src/ffi/traceback.cc"
#include "../3rdparty/tvm-ffi/src/ffi/container.cc"
#include "../3rdparty/tvm-ffi/src/ffi/dtype.cc"
#include "../3rdparty/tvm-ffi/src/ffi/error.cc"
#include "../3rdparty/tvm-ffi/src/ffi/extra/library_module.cc"
#include "../3rdparty/tvm-ffi/src/ffi/extra/library_module_dynamic_lib.cc"
#include "../3rdparty/tvm-ffi/src/ffi/extra/library_module_system_lib.cc"
#include "../3rdparty/tvm-ffi/src/ffi/extra/module.cc"
#include "../3rdparty/tvm-ffi/src/ffi/extra/testing.cc"
#include "../3rdparty/tvm-ffi/src/ffi/function.cc"
#include "../3rdparty/tvm-ffi/src/ffi/object.cc"
#include "../3rdparty/tvm-ffi/src/ffi/tensor.cc"
#include "../3rdparty/tvm-ffi/src/ffi/traceback.cc"
#include "../src/runtime/cpu_device_api.cc"
#include "../src/runtime/device_api.cc"
#include "../src/runtime/file_utils.cc"
Expand Down
2 changes: 1 addition & 1 deletion apps/ios_rpc/tvmrpc/TVMRuntime.mm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

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

Expand Down
2 changes: 1 addition & 1 deletion docs/install/from_source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Therefore, after we finish the build, we need to install the tvm-ffi package.

.. code-block:: bash

cd ffi; pip install .; cd ..
cd 3rdparty/tvm-ffi; pip install .; cd ..


Leaving the build environment ``tvm-build-venv``, there are two ways to install the successful build into your environment:
Expand Down
8 changes: 0 additions & 8 deletions ffi/.clang-format

This file was deleted.

262 changes: 0 additions & 262 deletions ffi/CMakeLists.txt

This file was deleted.

18 changes: 0 additions & 18 deletions ffi/README.md

This file was deleted.

Loading
Loading