Skip to content

Commit cd668fe

Browse files
potatomashedpotatomashed
committed
feat(py_class): Feature Complete for V0.1
1 parent 9c3279b commit cd668fe

34 files changed

+1516
-835
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v3.2.0
5+
rev: v5.0.0
66
hooks:
77
- id: trailing-whitespace
88
- id: mixed-line-ending
@@ -46,3 +46,9 @@ repos:
4646
# hooks:
4747
# - id: cmake-format
4848
# - id: cmake-lint
49+
- repo: https://github.com/compilerla/conventional-pre-commit
50+
rev: v2.1.1
51+
hooks:
52+
- id: conventional-pre-commit
53+
stages: [commit-msg]
54+
args: [feat, fix, ci, chore, test]

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
22

33
project(
44
mlc
5-
VERSION 0.0.11
5+
VERSION 0.0.12
66
DESCRIPTION "MLC-Python"
77
LANGUAGES C CXX
88
)

‎cpp/c_api.cc‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,27 +68,45 @@ MLC_API int32_t MLCTypeKey2Info(MLCTypeTableHandle _self, const char *type_key,
6868
MLC_SAFE_CALL_END(&last_error);
6969
}
7070

71-
MLC_API int32_t MLCTypeDefReflection(MLCTypeTableHandle self, int32_t type_index, int64_t num_fields,
72-
MLCTypeField *fields, int64_t num_methods, MLCTypeMethod *methods,
73-
int32_t structure_kind, int64_t num_sub_structures, int32_t *sub_structure_indices,
74-
int32_t *sub_structure_kinds) {
71+
MLC_API int32_t MLCTypeRegisterFields(MLCTypeTableHandle _self, int32_t type_index, int64_t num_fields,
72+
MLCTypeField *fields) {
7573
MLC_SAFE_CALL_BEGIN();
76-
auto *type_info = TypeTable::Get(self)->GetTypeInfoWrapper(type_index);
77-
type_info->SetFields(num_fields, fields);
78-
type_info->SetMethods(num_methods, methods);
79-
type_info->SetStructure(structure_kind, num_sub_structures, sub_structure_indices, sub_structure_kinds);
74+
TypeTable::Get(_self)->SetFields(type_index, num_fields, fields);
8075
MLC_SAFE_CALL_END(&last_error);
8176
}
8277

83-
MLC_API int32_t MLCVTableSet(MLCTypeTableHandle _self, int32_t type_index, const char *key, MLCAny *value) {
78+
MLC_API int32_t MLCTypeRegisterStructure(MLCTypeTableHandle _self, int32_t type_index, int32_t structure_kind,
79+
int64_t num_sub_structures, int32_t *sub_structure_indices,
80+
int32_t *sub_structure_kinds) {
8481
MLC_SAFE_CALL_BEGIN();
85-
TypeTable::Get(_self)->SetVTable(type_index, key, static_cast<AnyView *>(value));
82+
TypeTable::Get(_self)->SetStructure(type_index, structure_kind, num_sub_structures, sub_structure_indices,
83+
sub_structure_kinds);
8684
MLC_SAFE_CALL_END(&last_error);
8785
}
8886

89-
MLC_API int32_t MLCVTableGet(MLCTypeTableHandle _self, int32_t type_index, const char *key, MLCAny *value) {
87+
MLC_API int32_t MLCTypeAddMethod(MLCTypeTableHandle _self, int32_t type_index, MLCTypeMethod method) {
9088
MLC_SAFE_CALL_BEGIN();
91-
*static_cast<Any *>(value) = TypeTable::Get(_self)->GetVTable(type_index, key);
89+
TypeTable::Get(_self)->AddMethod(type_index, method);
90+
MLC_SAFE_CALL_END(&last_error);
91+
}
92+
93+
MLC_API int32_t MLCVTableGetGlobal(MLCTypeTableHandle _self, const char *key, MLCVTableHandle *ret) {
94+
MLC_SAFE_CALL_BEGIN();
95+
*ret = TypeTable::Get(_self)->GetGlobalVTable(key);
96+
MLC_SAFE_CALL_END(&last_error);
97+
}
98+
99+
MLC_API int32_t MLCVTableGetFunc(MLCVTableHandle vtable, int32_t type_index, int32_t allow_ancestor, MLCAny *ret) {
100+
using ::mlc::registry::VTable;
101+
MLC_SAFE_CALL_BEGIN();
102+
*static_cast<Any *>(ret) = static_cast<VTable *>(vtable)->GetFunc(type_index, allow_ancestor);
103+
MLC_SAFE_CALL_END(&last_error);
104+
}
105+
106+
MLC_API int32_t MLCVTableSetFunc(MLCVTableHandle vtable, int32_t type_index, MLCFunc *func, int32_t override_mode) {
107+
using ::mlc::registry::VTable;
108+
MLC_SAFE_CALL_BEGIN();
109+
static_cast<VTable *>(vtable)->Set(type_index, static_cast<FuncObj *>(func), override_mode);
92110
MLC_SAFE_CALL_END(&last_error);
93111
}
94112

‎cpp/c_api_tests.cc‎

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,23 @@ struct TestingCClassObj : public Object {
5959

6060
explicit TestingCClassObj(int8_t i8, int16_t i16, int32_t i32, int64_t i64, float f32, double f64, void *raw_ptr,
6161
DLDataType dtype, DLDevice device, Any any, Func func, UList ulist, UDict udict, Str str_,
62-
Str str_readonly,
63-
//
64-
List<Any> list_any, List<List<int>> list_list_int, Dict<Any, Any> dict_any_any,
65-
Dict<Str, Any> dict_str_any, Dict<Any, Str> dict_any_str,
66-
Dict<Str, List<int>> dict_str_list_int,
67-
//
68-
Optional<int64_t> opt_i64, Optional<double> opt_f64, Optional<void *> opt_raw_ptr,
69-
Optional<DLDataType> opt_dtype, Optional<DLDevice> opt_device, Optional<Func> opt_func,
70-
Optional<UList> opt_ulist, Optional<UDict> opt_udict, Optional<Str> opt_str,
71-
//
72-
Optional<List<Any>> opt_list_any, Optional<List<List<int>>> opt_list_list_int,
73-
Optional<Dict<Any, Any>> opt_dict_any_any, Optional<Dict<Str, Any>> opt_dict_str_any,
74-
Optional<Dict<Any, Str>> opt_dict_any_str,
62+
Str str_readonly, List<Any> list_any, List<List<int>> list_list_int,
63+
Dict<Any, Any> dict_any_any, Dict<Str, Any> dict_str_any, Dict<Any, Str> dict_any_str,
64+
Dict<Str, List<int>> dict_str_list_int, Optional<int64_t> opt_i64, Optional<double> opt_f64,
65+
Optional<void *> opt_raw_ptr, Optional<DLDataType> opt_dtype, Optional<DLDevice> opt_device,
66+
Optional<Func> opt_func, Optional<UList> opt_ulist, Optional<UDict> opt_udict,
67+
Optional<Str> opt_str, Optional<List<Any>> opt_list_any,
68+
Optional<List<List<int>>> opt_list_list_int, Optional<Dict<Any, Any>> opt_dict_any_any,
69+
Optional<Dict<Str, Any>> opt_dict_str_any, Optional<Dict<Any, Str>> opt_dict_any_str,
7570
Optional<Dict<Str, List<int>>> opt_dict_str_list_int)
7671
: i8(i8), i16(i16), i32(i32), i64(i64), f32(f32), f64(f64), raw_ptr(raw_ptr), dtype(dtype), device(device),
77-
any(any), func(func), ulist(ulist), udict(udict), str_(str_), str_readonly(str_readonly),
78-
//
79-
list_any(list_any), list_list_int(list_list_int), dict_any_any(dict_any_any), dict_str_any(dict_str_any),
80-
dict_any_str(dict_any_str), dict_str_list_int(dict_str_list_int),
81-
//
82-
opt_i64(opt_i64), opt_f64(opt_f64), opt_raw_ptr(opt_raw_ptr), opt_dtype(opt_dtype), opt_device(opt_device),
83-
opt_func(opt_func), opt_ulist(opt_ulist), opt_udict(opt_udict), opt_str(opt_str),
84-
//
85-
opt_list_any(opt_list_any), opt_list_list_int(opt_list_list_int), opt_dict_any_any(opt_dict_any_any),
86-
opt_dict_str_any(opt_dict_str_any), opt_dict_any_str(opt_dict_any_str),
87-
opt_dict_str_list_int(opt_dict_str_list_int) {}
72+
any(any), func(func), ulist(ulist), udict(udict), str_(str_), str_readonly(str_readonly), list_any(list_any),
73+
list_list_int(list_list_int), dict_any_any(dict_any_any), dict_str_any(dict_str_any),
74+
dict_any_str(dict_any_str), dict_str_list_int(dict_str_list_int), opt_i64(opt_i64), opt_f64(opt_f64),
75+
opt_raw_ptr(opt_raw_ptr), opt_dtype(opt_dtype), opt_device(opt_device), opt_func(opt_func),
76+
opt_ulist(opt_ulist), opt_udict(opt_udict), opt_str(opt_str), opt_list_any(opt_list_any),
77+
opt_list_list_int(opt_list_list_int), opt_dict_any_any(opt_dict_any_any), opt_dict_str_any(opt_dict_str_any),
78+
opt_dict_any_str(opt_dict_any_str), opt_dict_str_list_int(opt_dict_str_list_int) {}
8879

8980
int64_t i64_plus_one() const { return i64 + 1; }
9081

@@ -108,14 +99,12 @@ struct TestingCClass : public ObjectRef {
10899
.Field("udict", &TestingCClassObj::udict)
109100
.Field("str_", &TestingCClassObj::str_)
110101
.FieldReadOnly("str_readonly", &TestingCClassObj::str_readonly)
111-
//
112102
.Field("list_any", &TestingCClassObj::list_any)
113103
.Field("list_list_int", &TestingCClassObj::list_list_int)
114104
.Field("dict_any_any", &TestingCClassObj::dict_any_any)
115105
.Field("dict_str_any", &TestingCClassObj::dict_str_any)
116106
.Field("dict_any_str", &TestingCClassObj::dict_any_str)
117107
.Field("dict_str_list_int", &TestingCClassObj::dict_str_list_int)
118-
//
119108
.Field("opt_i64", &TestingCClassObj::opt_i64)
120109
.Field("opt_f64", &TestingCClassObj::opt_f64)
121110
.Field("opt_raw_ptr", &TestingCClassObj::opt_raw_ptr)
@@ -125,25 +114,19 @@ struct TestingCClass : public ObjectRef {
125114
.Field("opt_ulist", &TestingCClassObj::opt_ulist)
126115
.Field("opt_udict", &TestingCClassObj::opt_udict)
127116
.Field("opt_str", &TestingCClassObj::opt_str)
128-
//
129117
.Field("opt_list_any", &TestingCClassObj::opt_list_any)
130118
.Field("opt_list_list_int", &TestingCClassObj::opt_list_list_int)
131119
.Field("opt_dict_any_any", &TestingCClassObj::opt_dict_any_any)
132120
.Field("opt_dict_str_any", &TestingCClassObj::opt_dict_str_any)
133121
.Field("opt_dict_any_str", &TestingCClassObj::opt_dict_any_str)
134122
.Field("opt_dict_str_list_int", &TestingCClassObj::opt_dict_str_list_int)
135-
//
136123
.MemFn("i64_plus_one", &TestingCClassObj::i64_plus_one)
137124
.StaticFn("__init__",
138125
InitOf<TestingCClassObj, int8_t, int16_t, int32_t, int64_t, float, double, void *, DLDataType, DLDevice,
139-
Any, Func, UList, UDict, Str, Str,
140-
//
141-
List<Any>, List<List<int>>, Dict<Any, Any>, Dict<Str, Any>, Dict<Any, Str>, Dict<Str, List<int>>,
142-
//
143-
Optional<int64_t>, Optional<double>, Optional<void *>, Optional<DLDataType>, Optional<DLDevice>,
144-
Optional<Func>, Optional<UList>, Optional<UDict>, Optional<Str>,
145-
//
146-
Optional<List<Any>>, Optional<List<List<int>>>, Optional<Dict<Any, Any>>,
126+
Any, Func, UList, UDict, Str, Str, List<Any>, List<List<int>>, Dict<Any, Any>, Dict<Str, Any>,
127+
Dict<Any, Str>, Dict<Str, List<int>>, Optional<int64_t>, Optional<double>, Optional<void *>,
128+
Optional<DLDataType>, Optional<DLDevice>, Optional<Func>, Optional<UList>, Optional<UDict>,
129+
Optional<Str>, Optional<List<Any>>, Optional<List<List<int>>>, Optional<Dict<Any, Any>>,
147130
Optional<Dict<Str, Any>>, Optional<Dict<Any, Str>>, Optional<Dict<Str, List<int>>>>);
148131
};
149132

0 commit comments

Comments
 (0)