p85620714
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

optimize custom vector

This commit is contained in:
jianghui58 2020-09-22 14:35:12 +08:00
parent 93d742732e
commit dcea00321a
4 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mindspore/lite/internal/include/vector.h
View File

@ -17,26 +17,24 @@
#define MINDSPORE_LITE_INTERNAL_INCLUDE_VECTOR_H
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
#include <initializer_list>
#include "internal/include/string.h"
#define DEFAULT_CAPACITY 1
#define DEFAULT_CAPACITY 4
struct MSTensor;
struct Node;
template <typename T>
class Vector {
private:
size_t size_;
size_t elem_size_;
size_t capacity_;
T *data_;
public:
Vector();
explicit Vector(size_t size);
Vector(size_t size, const T &value);
Vector(const Vector<T> &vector);
~Vector();
@ -92,23 +90,29 @@ class Vector {
void reserve(size_t capacity);
Vector<T> &operator=(const Vector<T> &v);
private:
size_t size_;
size_t elem_size_;
size_t capacity_;
T *data_;
};
template <typename T>
bool operator==(const Vector<T> &lhs, const Vector<T> &rhs) {
if (lhs.size() != rhs.size()) {
return false;
if (lhs.size() != rhs.size()) {
return false;
}
for (int i = 0; i < lhs.size(); ++i) {
if (lhs[i] != rhs[i]) {
return false;
}
for (int i = 0; i < lhs.size(); ++i) {
if (lhs[i] != rhs[i]) {
return false;
}
}
return true;
}
return true;
}
template <typename T>
bool operator!=(const Vector<T> &lhs, const Vector<T> &rhs) {
return !(lhs == rhs);
return !(lhs == rhs);
}
#endif // MINDSPORE_LITE_INTERNAL_INCLUDE_VECTOR_H

107
mindspore/lite/internal/src/common/vector.cc
View File

@ -14,13 +14,12 @@
* limitations under the License.
*/
#include "internal/include/vector.h"
#include <stdlib.h>
#include <string.h>
#include "internal/include/string.h"
#include "internal/src/lite_log.h"
#define min(x, y) ((x < y) ? (x) : (y))
#define MIN(x, y) ((x < y) ? (x) : (y))
template<typename T>
template <typename T>
Vector<T>::Vector() {
size_ = 0;
capacity_ = DEFAULT_CAPACITY;
@ -28,7 +27,7 @@ Vector<T>::Vector() {
data_ = nullptr;
}
template<typename T>
template <typename T>
Vector<T>::Vector(size_t size) {
size_ = size;
elem_size_ = sizeof(T);
@ -40,7 +39,21 @@ Vector<T>::Vector(size_t size) {
memset(data_, 0, capacity_ * elem_size_);
}
template<typename T>
template <typename T>
Vector<T>::Vector(size_t size, const T &value) {
size_ = size;
elem_size_ = sizeof(T);
capacity_ = size;
data_ = reinterpret_cast<T *>(malloc(capacity_ * elem_size_));
if (data_ == nullptr) {
MS_C_EXCEPTION("malloc data failed");
}
for (int i = 0; i < size; ++i) {
data_[i] = value;
}
}
template <typename T>
Vector<T>::Vector(const Vector<T> &vec) {
size_ = vec.size_;
elem_size_ = sizeof(T);
@ -52,7 +65,7 @@ Vector<T>::Vector(const Vector<T> &vec) {
memcpy(data_, vec.data_, size_ * elem_size_);
}
template<typename T>
template <typename T>
Vector<T> &Vector<T>::operator=(const Vector<T> &vec) {
if (this == &vec) {
return *this;
@ -68,14 +81,14 @@ Vector<T> &Vector<T>::operator=(const Vector<T> &vec) {
return *this;
}
template<typename T>
template <typename T>
Vector<T>::~Vector() {
if (data_ != nullptr) {
free(data_);
}
}
template<typename T>
template <typename T>
void Vector<T>::clear() {
size_ = 0;
if (data_ != nullptr) {
@ -84,7 +97,7 @@ void Vector<T>::clear() {
}
}
template<typename T>
template <typename T>
void Vector<T>::push_back(const T &elem) {
if (data_ == nullptr) {
data_ = reinterpret_cast<T *>(malloc(capacity_ * elem_size_));
@ -95,14 +108,14 @@ void Vector<T>::push_back(const T &elem) {
resize(size_ + 1);
--size_;
}
memcpy(data_ + size_, &elem, elem_size_);
data_[size_] = elem;
++size_;
}
template<typename T>
template <typename T>
void Vector<T>::push_back(T &&elem) {
if (data_ == nullptr) {
data_ = reinterpret_cast<T *>(malloc(capacity_ * elem_size_));
data_ = reinterpret_cast<T *>(malloc(elem_size_));
if (data_ == nullptr) {
MS_C_EXCEPTION("malloc data failed");
}
@ -110,11 +123,11 @@ void Vector<T>::push_back(T &&elem) {
resize(size_ + 1);
--size_;
}
memcpy(data_ + size_, &elem, elem_size_);
data_[size_] = elem;
++size_;
}
template<typename T>
template <typename T>
void Vector<T>::pop_back() {
if (size_ > 0) {
--size_;
@ -123,7 +136,7 @@ void Vector<T>::pop_back() {
}
}
template<typename T>
template <typename T>
void Vector<T>::insert(const T &elem, size_t index) {
if (index <= size_) {
++size_;
@ -134,121 +147,121 @@ void Vector<T>::insert(const T &elem, size_t index) {
push_back(elem);
} else {
memmove(data_ + index + 1, data_ + index, (size_ - index - 1) * elem_size_);
memcpy(data_ + index, &elem, elem_size_);
data_[index] = elem;
}
} else {
MS_C_EXCEPTION("Input index is out of range!");
}
}
template<typename T>
template <typename T>
T *Vector<T>::begin() {
return data_;
}
template<typename T>
template <typename T>
const T *Vector<T>::begin() const {
return data_;
}
template<typename T>
template <typename T>
T *Vector<T>::end() {
return data_ + size_;
}
template<typename T>
template <typename T>
const T *Vector<T>::end() const {
return data_ + size_;
}
template<typename T>
template <typename T>
T &Vector<T>::front() {
if (size_ > 0) {
return *data_;
return data_[0];
}
MS_C_EXCEPTION("Index is out of range!");
}
template<typename T>
template <typename T>
const T &Vector<T>::front() const {
if (size_ > 0) {
return *data_;
return data_[0];
}
MS_C_EXCEPTION("Index is out of range!");
}
template<typename T>
template <typename T>
T &Vector<T>::back() {
if (size_ > 0) {
return *(data_ + size_ - 1);
return data_[size_ - 1];
}
MS_C_EXCEPTION("Index is out of range!");
}
template<typename T>
template <typename T>
const T &Vector<T>::back() const {
if (size_ > 0) {
return *(data_ + size_ - 1);
return data_[size_ - 1];
}
MS_C_EXCEPTION("Index is out of range!");
}
template<typename T>
template <typename T>
T &Vector<T>::at(size_t index) {
if (index < size_) {
return *(data_ + index);
return data_[index];
}
MS_C_EXCEPTION("Input index is out of range!");
}
template<typename T>
template <typename T>
const T &Vector<T>::at(size_t index) const {
if (index < size_) {
return *(data_ + index);
return data_[index];
}
MS_C_EXCEPTION("Input index is out of range!");
}
template<typename T>
template <typename T>
T &Vector<T>::operator[](size_t index) {
if (index < size_) {
return *(data_ + index);
return data_[index];
}
MS_C_EXCEPTION("Input index is out of range!");
}
template<typename T>
template <typename T>
const T &Vector<T>::operator[](size_t index) const {
if (index < size_) {
return *(data_ + index);
return data_[index];
}
MS_C_EXCEPTION("Input index is out of range!");
}
template<typename T>
template <typename T>
T *Vector<T>::data() {
return data_;
}
template<typename T>
template <typename T>
const T *Vector<T>::data() const {
return data_;
}
template<typename T>
template <typename T>
size_t Vector<T>::size() const {
return size_;
}
template<typename T>
template <typename T>
size_t Vector<T>::capacity() const {
return capacity_;
}
template<typename T>
template <typename T>
bool Vector<T>::empty() const {
return size_ == 0;
}
template<typename T>
template <typename T>
void Vector<T>::erase(size_t index) {
if (index == size_ - 1) {
--size_;
@ -260,9 +273,9 @@ void Vector<T>::erase(size_t index) {
}
}
template<typename T>
template <typename T>
void Vector<T>::resize(size_t size) {
if (size > capacity_) {
while (size > capacity_) {
capacity_ *= 2;
}
T *tmp = data_;
@ -270,12 +283,12 @@ void Vector<T>::resize(size_t size) {
if (data_ == nullptr) {
MS_C_EXCEPTION("malloc data failed");
}
memcpy(data_, tmp, min(size, size_) * elem_size_);
memcpy(data_, tmp, MIN(size, size_) * elem_size_);
size_ = size;
free(tmp);
}
template<typename T>
template <typename T>
void Vector<T>::reserve(size_t capacity) {
if (capacity > capacity_) {
capacity_ = capacity;

10
mindspore/lite/internal/src/kernel/fp32/matmul.cc
View File

@ -85,6 +85,7 @@ int DoMatMulInferShape(const TensorPtrVector &in_tensors, const TensorPtrVector
int *in_shape[2] = {input0->shape_.data(), input1->shape_.data()};
int out_format;
int out_datatype;
output->shape_.resize(input0->shape_.size());
int ret = MatMulInferShape(in_shape, 2, dim_size, output->shape_.data(), in_format, &out_format, in_datatype,
&out_datatype, param);
if (ret != NNACL_OK) {
@ -134,16 +135,16 @@ int DoMatMul(const TensorPtrVector &in_tensors, const TensorPtrVector &out_tenso
LITE_LOG_ERROR("Malloc MatMulCPUKernelData failed");
return RET_MEMORY_FAILED;
}
kernel_data->a_c12_ptr_
= reinterpret_cast<float *>(allocator->Malloc(params->batch * params->row_12_ * params->deep_ * sizeof(float)));
kernel_data->a_c12_ptr_ =
reinterpret_cast<float *>(allocator->Malloc(params->batch * params->row_12_ * params->deep_ * sizeof(float)));
if (kernel_data->a_c12_ptr_ == NULL) {
FreeMatMulKernelData(kernel_data, allocator);
return RET_MEMORY_FAILED;
}
memset(kernel_data->a_c12_ptr_, 0, params->row_12_ * params->deep_ * sizeof(float));
kernel_data->b_r8_ptr_
= reinterpret_cast<float *>(allocator->Malloc(params->batch * params->col_8_ * params->deep_ * sizeof(float)));
kernel_data->b_r8_ptr_ =
reinterpret_cast<float *>(allocator->Malloc(params->batch * params->col_8_ * params->deep_ * sizeof(float)));
if (kernel_data->b_r8_ptr_ == NULL) {
FreeMatMulKernelData(kernel_data, allocator);
return RET_MEMORY_FAILED;
@ -173,4 +174,3 @@ int DoMatMul(const TensorPtrVector &in_tensors, const TensorPtrVector &out_tenso
return RET_OK;
}

5
mindspore/lite/internal/src/lite_log.h
View File

@ -23,13 +23,12 @@
#include <assert.h>
#endif
#ifndef Release
#ifdef Debug
#define LITE_DEBUG_LOG(format, ...) \
printf("[DEBUG] [%s %s] [%s] [%d] " format "\n", __DATE__, __TIME__, __FILE__, __LINE__, __VA_ARGS__)
#define LITE_INFO_LOG(format, ...) \
printf("[INFO] [%s %s] [%s] [%d] " format "\n", __DATE__, __TIME__, __FILE__, __LINE__, __VA_ARGS__)
#define LITE_LOG_INFO(...) \
printf("[INFO] [%s %s] [%s] [%d] %s\n", __DATE__, __TIME__, __FILE__, __LINE__, __VA_ARGS__)
#define LITE_LOG_INFO(...) printf("[INFO] [%s %s] [%s] [%d] %s\n", __DATE__, __TIME__, __FILE__, __LINE__, __VA_ARGS__)
#define LITE_WARNING_LOG(format, ...) \
printf("[WARNING] [%s %s] [%s] [%d] " format "\n", __DATE__, __TIME__, __FILE__, __LINE__, __VA_ARGS__)
#define LITE_ERROR_LOG(format, ...) \