From f8f9e453b5c51a8f52dc8c510a692c43587970f8 Mon Sep 17 00:00:00 2001 From: sunwen Date: Mon, 9 Oct 2023 09:46:24 +0800 Subject: [PATCH] Fix zcopy. --- src/Function2D.cpp | 6 +++--- src/Matrix.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Function2D.cpp b/src/Function2D.cpp index b4cc1d2..3228ea3 100644 --- a/src/Function2D.cpp +++ b/src/Function2D.cpp @@ -714,7 +714,7 @@ Matrix Aurora::fft(const Matrix &aMatrix, long aFFTSize) { } else { //按列copy原值 for (int i = 0 ; i < aMatrix.getDimSize(1); ++i) { - cblas_zcopy(needCopySize, aMatrix.getData()+i*aMatrix.getDimSize(0)*2, 1, output+i*rowSize*2, 1); + cblas_ccopy(needCopySize, aMatrix.getData()+i*aMatrix.getDimSize(0)*2, 1, output+i*rowSize*2, 1); } } @@ -787,7 +787,7 @@ Matrix Aurora::ifft(const Matrix &aMatrix, long aFFTSize ) { } else { //按列copy原值 for (int i = 0 ; i < aMatrix.getDimSize(1); ++i) { - cblas_zcopy(needCopySize, aMatrix.getData()+i*aMatrix.getDimSize(0)*2, 1, output+i*rowSize*2, 1); + cblas_ccopy(needCopySize, aMatrix.getData()+i*aMatrix.getDimSize(0)*2, 1, output+i*rowSize*2, 1); } } //创建 Descriptor, 精度 float , 输入类型实数, 维度1 @@ -850,7 +850,7 @@ Matrix Aurora::ifft_symmetric(const Matrix &aMatrix,long length) //所有数据统一置0 cblas_scopy(length*2,&zero,0,calcData,1); //copy前半段数据 - cblas_zcopy(copyLength,aMatrix.getData(),1,calcData,1); + cblas_ccopy(copyLength,aMatrix.getData(),1,calcData,1); //copy后半段数据,跳过index 0的值,并设置虚部共轭 vsAddI(copyLength-1,&zero,0,(aMatrix.getData()+2),2,(calcData+(length-1)*2),-2); vsSubI(copyLength-1,&zero,0,(aMatrix.getData()+2+1),2,(calcData+(length-1)*2+1),-2); diff --git a/src/Matrix.cpp b/src/Matrix.cpp index 3932c45..7fa19dd 100644 --- a/src/Matrix.cpp +++ b/src/Matrix.cpp @@ -1492,7 +1492,7 @@ namespace Aurora { // cblas_zcopy_batch_strided(mSize,(std::complex*)slice.mData,slice.mStride,slice.mStride2, // (std::complex*)mData,mStride,mStride2,mSize2); for (int i = 0; i < mSize2; ++i) { - cblas_zcopy(mSize, (std::complex *) (slice.mData + i * slice.mStride2), slice.mStride, + cblas_ccopy(mSize, (std::complex *) (slice.mData + i * slice.mStride2), slice.mStride, (std::complex *) (mData + i * mStride2), mStride); } } @@ -1503,7 +1503,7 @@ namespace Aurora { cblas_scopy(mSize,slice.mData,slice.mStride,mData,mStride); } else { - cblas_zcopy(mSize, (std::complex *)slice.mData, slice.mStride, (std::complex *)mData, mStride); + cblas_ccopy(mSize, (std::complex *)slice.mData, slice.mStride, (std::complex *)mData, mStride); } break; } @@ -1575,7 +1575,7 @@ namespace Aurora { mStride2, mSize2); } else { - cblas_zcopy_batch_strided(mSize,(std::complex*)matrix.getData(),1,matrix.getDimSize(0), + cblas_ccopy_batch_strided(mSize,(std::complex*)matrix.getData(),1,matrix.getDimSize(0), (std::complex*)mData,mStride,mStride2,mSize2); } break; @@ -1586,7 +1586,7 @@ namespace Aurora { cblas_scopy(mSize,matrix.getData(),1,mData,mStride); } else { - cblas_zcopy(mSize, (std::complex *) matrix.getData(),1, + cblas_ccopy(mSize, (std::complex *) matrix.getData(),1, (std::complex *) mData, mStride); } break; @@ -1654,7 +1654,7 @@ namespace Aurora { mStride2,data, 1, mSize, mSize2); } else { - cblas_zcopy_batch_strided(mSize, (std::complex *) mData, mStride, mStride2, + cblas_ccopy_batch_strided(mSize, (std::complex *) mData, mStride, mStride2, (std::complex *) data, 1, mSize, mSize2); } @@ -1665,7 +1665,7 @@ namespace Aurora { cblas_scopy(mSize,mData,mStride,data,1); } else { - cblas_zcopy(mSize, (std::complex *) mData, mStride, + cblas_ccopy(mSize, (std::complex *) mData, mStride, (std::complex *) data, 1); } break;