sunwen/Aurora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Matrix free bug(with mkl_malloc)

Browse Source
This commit is contained in:
Krad
2023-04-20 09:32:58 +08:00
parent fedf13d5d0
commit 044de7be5f
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Matrix.cpp
View File

@@ -118,6 +118,14 @@ namespace Aurora {
Matrix::Matrix(std::shared_ptr<double> aData, std::vector<int> aInfo)
: mData(aData), mInfo(aInfo) {
}
Matrix::Matrix(const Matrix::MatrixSlice& slice) {
auto temp = slice.toMatrix();
this->mData = temp.mData;
this->mInfo = temp.mInfo;
this->mValueType = temp.mValueType;
}
bool Matrix::isNull() const {
return !mData || mInfo.empty();
}
@@ -185,7 +193,7 @@ namespace Aurora {
vector.push_back(rows);
if (cols > 0)vector.push_back(cols);
if (slices > 0)vector.push_back(slices);
Matrix ret({data, std::default_delete<double[]>()}, vector);
Matrix ret({data, free}, vector);
if (type != Normal)ret.setValueType(type);
return ret;
}
@@ -471,39 +479,40 @@ namespace Aurora {
return *this;
}
Matrix Matrix::MatrixSlice::toMatrix() {
auto data = (double *) mkl_malloc(mSize*(mSize2>0?mSize2:1) * sizeof(double)*mType, 64);
auto matrix = Matrix::New(data,mSize,mSize2,0,mType);
Matrix Matrix::MatrixSlice::toMatrix() const {
double * data = (double *) mkl_malloc(mSize*(mSize2>0?mSize2:1) * sizeof(double)*mType, 64);
switch (mSliceMode) {
case 2:{
if (mType== Normal) {
cblas_dcopy_batch_strided(mSize, mData, mStride,
mStride2,matrix.getData(), 1, matrix.getDimSize(0), mSize2);
mStride2,data, 1, mSize, mSize2);
}
else {
cblas_zcopy_batch_strided(mSize, (std::complex<double> *) mData, mStride, mStride2,
(std::complex<double> *) matrix.getData(), 1, matrix.getDimSize(0),
(std::complex<double> *) data, 1, mSize,
mSize2);
}
break;
}
case 1:{
if (mType== Normal){
cblas_dcopy(mSize,mData,mStride,matrix.getData(),1);
cblas_dcopy(mSize,mData,mStride,data,1);
}
else {
cblas_zcopy(mSize, (std::complex<double> *) mData, mStride,
(std::complex<double> *) matrix.getData(), 1);
(std::complex<double> *) data, 1);
}
break;
}
case 0:
default:{
matrix.getData()[0]= mData[0];
if (mType != Normal) matrix.getData()[1] = mData[1];
data[0]= mData[0];
if (mType != Normal) data[1] = mData[1];
}
}
return matrix;
return Matrix::New(data,mSize,mSize2,0,mType);
}
}