File tree Expand file tree Collapse file tree 3 files changed +23
-11
lines changed Expand file tree Collapse file tree 3 files changed +23
-11
lines changed Original file line number Diff line number Diff line change @@ -24,9 +24,7 @@ const int MALLOC_ALIGN = 64;
24
24
void * TargetWrapper<TARGET(kHost )>::Malloc(size_t size) {
25
25
size_t offset = sizeof (void *) + MALLOC_ALIGN - 1 ;
26
26
char * p = static_cast <char *>(malloc (offset + size));
27
- if (!p) {
28
- return nullptr ;
29
- }
27
+ CHECK (p);
30
28
void * r = reinterpret_cast <void *>(reinterpret_cast <size_t >(p + offset) &
31
29
(~(MALLOC_ALIGN - 1 )));
32
30
static_cast <void **>(r)[-1 ] = p;
@@ -41,6 +39,8 @@ void TargetWrapper<TARGET(kHost)>::MemcpySync(void* dst,
41
39
const void * src,
42
40
size_t size,
43
41
IoDirection dir) {
42
+ CHECK (dst);
43
+ CHECK (src);
44
44
memcpy (dst, src, size);
45
45
}
46
46
Original file line number Diff line number Diff line change @@ -61,11 +61,13 @@ void SetParamWithTensor(const std::string& name,
61
61
}
62
62
63
63
void SetTensorWithParam (lite::Tensor* tensor, const ParamDescReadAPI& param) {
64
+ CHECK (tensor);
64
65
tensor->Resize (param.Dim ());
65
66
tensor->set_precision (lite::ConvertPrecisionType (param.GetDataType ()));
66
- std::memcpy (tensor->mutable_data (param.byte_size ()),
67
- param.GetData (),
68
- param.byte_size ());
67
+ auto * dst = tensor->mutable_data (param.byte_size ());
68
+ CHECK (dst);
69
+ CHECK (param.GetData ());
70
+ std::memcpy (dst, param.GetData (), param.byte_size ());
69
71
}
70
72
71
73
void SetCombinedParamsWithScope (const lite::Scope& scope,
@@ -82,9 +84,11 @@ void SetScopeWithCombinedParams(lite::Scope* scope,
82
84
const CombinedParamsDescReadAPI& params) {
83
85
CHECK (scope);
84
86
for (size_t i = 0 ; i < params.GetParamsSize (); ++i) {
85
- const auto & param = *params.GetParamDesc (i);
86
- auto * tensor = scope->Var (param.Name ())->GetMutable <lite::Tensor>();
87
- SetTensorWithParam (tensor, param);
87
+ const auto * param = params.GetParamDesc (i);
88
+ CHECK (param);
89
+ auto * tensor = scope->Var (param->Name ())->GetMutable <lite::Tensor>();
90
+ CHECK (tensor);
91
+ SetTensorWithParam (tensor, *param);
88
92
tensor->set_persistable (true );
89
93
}
90
94
}
Original file line number Diff line number Diff line change @@ -36,11 +36,17 @@ class ParamDescView : public ParamDescReadAPI {
36
36
CHECK (desc_->variable_type () ==
37
37
proto::ParamDesc_::VariableDesc_LoDTensorDesc);
38
38
tensor_desc_ = desc_->variable_as <proto::ParamDesc_::LoDTensorDesc>();
39
+ CHECK (tensor_desc_);
40
+ CHECK (tensor_desc_->data ());
41
+ }
42
+ std::string Name () const override {
43
+ CHECK (desc_->name ());
44
+ return desc_->name ()->c_str ();
39
45
}
40
- std::string Name () const override { return desc_->name ()->c_str (); }
41
46
42
47
std::vector<int64_t > Dim () const override {
43
- const auto & dims = tensor_desc_->dim ();
48
+ const auto * dims = tensor_desc_->dim ();
49
+ CHECK (dims);
44
50
std::vector<int64_t > dims_vec;
45
51
dims_vec.resize (dims->size ());
46
52
for (size_t i = 0 ; i < dims->size (); ++i) {
@@ -86,6 +92,8 @@ class CombinedParamsDescView : public CombinedParamsDescReadAPI {
86
92
87
93
void InitParams () {
88
94
desc_ = proto::GetCombinedParamsDesc (buf_.data ());
95
+ CHECK (desc_);
96
+ CHECK (desc_->params ());
89
97
size_t params_size = desc_->params ()->size ();
90
98
params_.resize (params_size);
91
99
for (size_t idx = 0 ; idx < params_size; ++idx) {
You can’t perform that action at this time.
0 commit comments