Skip to content

Commit a815db7

Browse files
tqchentqchen
committed
[FFI][ABI] Bump version ffi to latest
This PR bumps the version of tvm-ffi to latest, which involves an ABI change.
1 parent e1f93f3 commit a815db7

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎3rdparty/tvm-ffi‎

Submodule tvm-ffi updated 116 files

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#define TVM_LOG_CUSTOMIZE 1
3535
#define TVM_FFI_USE_LIBBACKTRACE 0
3636

37+
#include "../3rdparty/tvm-ffi/src/ffi/backtrace.cc"
3738
#include "../3rdparty/tvm-ffi/src/ffi/container.cc"
3839
#include "../3rdparty/tvm-ffi/src/ffi/dtype.cc"
3940
#include "../3rdparty/tvm-ffi/src/ffi/error.cc"
@@ -45,7 +46,6 @@
4546
#include "../3rdparty/tvm-ffi/src/ffi/function.cc"
4647
#include "../3rdparty/tvm-ffi/src/ffi/object.cc"
4748
#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"

‎include/tvm/runtime/logging.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class InternalError : public Error {
206206
*/
207207
InternalError(std::string file, int lineno, std::string message)
208208
: Error(DetectKind(message), DetectMessage(message),
209-
TVMFFITraceback(file.c_str(), lineno, "", 0)) {}
209+
TVMFFIBacktrace(file.c_str(), lineno, "", 0)) {}
210210

211211
private:
212212
// try to detect the kind of error from the message when the error type

‎python/tvm/relax/transform/transform.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def main_adjoint(
219219
# return value: (orig_return_values, tuple(adjoints))
220220
return ((lv1, lv2), (x_adjoint, y_adjoint))
221221
"""
222-
if require_grads is not None and not isinstance(require_grads, list):
222+
if require_grads is not None and not isinstance(require_grads, (list, tvm_ffi.Array)):
223223
require_grads = [require_grads]
224224

225225
return _ffi_api.Gradient(func_name, require_grads, target_index) # type: ignore

‎src/target/target.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ Any TargetInternal::ParseType(const std::string& str, const TargetKindNode::Valu
404404
result.push_back(parsed);
405405
} catch (const Error& e) {
406406
std::string index = "[" + std::to_string(result.size()) + "]";
407-
throw Error(e.kind(), e.message() + index, e.traceback());
407+
throw Error(e.kind(), e.message() + index, e.backtrace());
408408
}
409409
}
410410
return ffi::Array<ObjectRef>(result);
@@ -450,7 +450,7 @@ Any TargetInternal::ParseType(const Any& obj, const TargetKindNode::ValueTypeInf
450450
result.push_back(TargetInternal::ParseType(e, *info.key));
451451
} catch (const Error& e) {
452452
std::string index = '[' + std::to_string(result.size()) + ']';
453-
throw Error(e.kind(), index + e.message(), e.traceback());
453+
throw Error(e.kind(), index + e.message(), e.backtrace());
454454
}
455455
}
456456
return ffi::Array<Any>(result);
@@ -463,14 +463,14 @@ Any TargetInternal::ParseType(const Any& obj, const TargetKindNode::ValueTypeInf
463463
try {
464464
key = TargetInternal::ParseType(kv.first, *info.key);
465465
} catch (const Error& e) {
466-
throw Error(e.kind(), e.message() + ", during parse key of map", e.traceback());
466+
throw Error(e.kind(), e.message() + ", during parse key of map", e.backtrace());
467467
}
468468
try {
469469
val = TargetInternal::ParseType(kv.second, *info.val);
470470
} catch (const Error& e) {
471471
std::ostringstream os;
472472
os << ", during parseing value of map[\"" << key << "\"]";
473-
throw Error(e.kind(), e.message() + os.str(), e.traceback());
473+
throw Error(e.kind(), e.message() + os.str(), e.backtrace());
474474
}
475475
result[key] = val;
476476
}
@@ -579,7 +579,7 @@ Target::Target(const ffi::String& tag_or_config_or_target_str) {
579579
} catch (const Error& e) {
580580
std::ostringstream os;
581581
os << ". Target creation from string failed: " << tag_or_config_or_target_str;
582-
throw Error("ValueError", e.message() + os.str(), e.traceback());
582+
throw Error("ValueError", e.message() + os.str(), e.backtrace());
583583
}
584584
data_ = std::move(target);
585585
}
@@ -591,7 +591,7 @@ Target::Target(const ffi::Map<ffi::String, ffi::Any>& config) {
591591
} catch (const Error& e) {
592592
std::ostringstream os;
593593
os << ". Target creation from config dict failed: " << config;
594-
throw Error("ValueError", std::string(e.message()) + os.str(), e.traceback());
594+
throw Error("ValueError", std::string(e.message()) + os.str(), e.backtrace());
595595
}
596596
data_ = std::move(target);
597597
}
@@ -810,7 +810,7 @@ ObjectPtr<TargetNode> TargetInternal::FromRawString(const ffi::String& target_st
810810
iter += ParseKVPair(RemovePrefixDashes(options[iter]), s_next, &key, &value);
811811
} catch (const Error& e) {
812812
throw Error(e.kind(), e.message() + ", during parsing target `" + target_str + "`",
813-
e.traceback());
813+
e.backtrace());
814814
}
815815
try {
816816
// check if `key` has been used
@@ -820,7 +820,7 @@ ObjectPtr<TargetNode> TargetInternal::FromRawString(const ffi::String& target_st
820820
config[key] = TargetInternal::ParseType(value, TargetInternal::FindTypeInfo(kind, key));
821821
} catch (const Error& e) {
822822
throw Error(e.kind(), std::string(e.message()) + ", during parsing target[\"" + key + "\"]",
823-
e.traceback());
823+
e.backtrace());
824824
}
825825
}
826826
return TargetInternal::FromConfig(config);
@@ -927,7 +927,7 @@ ObjectPtr<TargetNode> TargetInternal::FromConfig(ffi::Map<ffi::String, ffi::Any>
927927
attrs[key] = TargetInternal::ParseType(value, info);
928928
} catch (const Error& e) {
929929
throw Error(e.kind(), std::string(e.message()) + ", during parsing target[\"" + key + "\"]",
930-
e.traceback());
930+
e.backtrace());
931931
}
932932
}
933933

‎src/tir/schedule/error.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ScheduleError : public tvm::runtime::Error {
3131
public:
3232
/*! \brief Base constructor */
3333
ScheduleError()
34-
: tvm::runtime::Error("ScheduleError", "", TVMFFITraceback(nullptr, 0, nullptr, 0)) {}
34+
: tvm::runtime::Error("ScheduleError", "", TVMFFIBacktrace(nullptr, 0, nullptr, 0)) {}
3535
/*! \brief The error occurred in this IRModule */
3636
virtual IRModule mod() const = 0;
3737
/*! \brief The locations of interest that we want to point out */

‎web/emcc/wasm_runtime.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "src/runtime/tensor.cc"
4949
#include "src/runtime/workspace_pool.cc"
5050
// relax setup
51+
#include "3rdparty/tvm-ffi/src/ffi/backtrace.cc"
5152
#include "3rdparty/tvm-ffi/src/ffi/container.cc"
5253
#include "3rdparty/tvm-ffi/src/ffi/dtype.cc"
5354
#include "3rdparty/tvm-ffi/src/ffi/error.cc"
@@ -58,7 +59,6 @@
5859
#include "3rdparty/tvm-ffi/src/ffi/function.cc"
5960
#include "3rdparty/tvm-ffi/src/ffi/object.cc"
6061
#include "3rdparty/tvm-ffi/src/ffi/tensor.cc"
61-
#include "3rdparty/tvm-ffi/src/ffi/traceback.cc"
6262
#include "src/runtime/memory/memory_manager.cc"
6363
#include "src/runtime/nvtx.cc"
6464
#include "src/runtime/vm/attn_backend.cc"

0 commit comments

Comments
 (0)