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

Fix horzcat with complex value bug.

Browse Source
This commit is contained in:
sunwen
2023-11-29 15:20:13 +08:00
parent f65542523d
commit 87dd34095c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Function1D.cpp
View File

@@ -726,10 +726,10 @@ Matrix Aurora::horzcat(const Matrix& aMatrix1, const Matrix& aMatrix2)
int column2 = aMatrix2.getDimSize(1);
int slice = aMatrix1.getDimSize(2);
int row = aMatrix1.getDimSize(0);
size_t size1= row*column1;
size_t size2= row*column2;
size_t size1= row*column1*aMatrix1.getValueType();
size_t size2= row*column2*aMatrix1.getValueType();
float* resultData = Aurora::malloc(aMatrix1.getDataSize() + aMatrix2.getDataSize(),aMatrix1.getValueType());
size_t sliceStride = row*(column1+column2);
size_t sliceStride = row*(column1+column2)*aMatrix1.getValueType();
for (size_t i = 0; i < slice; i++)
{
cblas_scopy(size1, aMatrix1.getData()+i*size1 , 1, resultData + i*sliceStride, 1);

4
test/Function1D_Test.cpp
View File

@@ -426,8 +426,8 @@ TEST_F(Function1D_Test, horzcat) {
result = Aurora::horzcat(matrix1,matrix2);
EXPECT_FLOAT_EQ(result.getData()[0],1);
EXPECT_FLOAT_EQ(result.getData()[1],2);
EXPECT_FLOAT_EQ(result.getData()[8],5);
EXPECT_FLOAT_EQ(result.getData()[9],6);
EXPECT_FLOAT_EQ(result.getData()[8],9);
EXPECT_FLOAT_EQ(result.getData()[9],10);
EXPECT_FLOAT_EQ(result.getDimSize(0),3);
EXPECT_FLOAT_EQ(result.getDimSize(1),2);