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

Add comment to Matrix::New function.

Browse Source
This commit is contained in:
Krad
2023-04-20 11:53:34 +08:00
parent 286008c4ab
commit 6ec61aa4cb
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Matrix.h
View File

@@ -41,10 +41,33 @@ namespace Aurora {
explicit Matrix(const Matrix::MatrixSlice& slice); explicit Matrix(const Matrix::MatrixSlice& slice);
/**
* New a mkl calculate based Matrix
* @attention Using New function, must use Aurora:malloc to get memory
* @param data
* @param rows
* @param cols
* @param slices
* @param type
* @return
*/
static Matrix New(double *data, int rows, int cols = 0, int slices = 0, ValueType type = Normal); static Matrix New(double *data, int rows, int cols = 0, int slices = 0, ValueType type = Normal);
/**
* New a mkl calculate based Matrix
* @attention Using New function, must use Aurora:malloc to get memory
* @param data
* @param shapeMatrix
* @return
*/
static Matrix New(double *data, const Matrix &shapeMatrix); static Matrix New(double *data, const Matrix &shapeMatrix);
/**
* New a mkl calculate based Matrix
* @attention Memory are allocate by Aurora:malloc function
* @param shapeMatrix
* @return
*/
static Matrix New(const Matrix &shapeMatrix); static Matrix New(const Matrix &shapeMatrix);
Matrix getDataFromDims2(int aColumn); Matrix getDataFromDims2(int aColumn);

11
src/main.cxx
View File

@@ -8,6 +8,7 @@
#include "Matrix.h" #include "Matrix.h"
#include "Function.h"
#include "Function1D.h" #include "Function1D.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
@@ -16,9 +17,9 @@
int main() { int main() {
{ {
double *dataA = new double[8]; double *dataA = Aurora::malloc(8);
double *dataB = new double[8]; double *dataB = Aurora::malloc(8);;
double *dataC = new double[4]; double *dataC = Aurora::malloc(8);;
for (int i = 0; i < 8; ++i) { for (int i = 0; i < 8; ++i) {
dataA[i] = (double) (i - 3); dataA[i] = (double) (i - 3);
dataB[i] = (double) (i + 2); dataB[i] = (double) (i + 2);
@@ -63,8 +64,8 @@ int main() {
printf("New A:\r\n"); printf("New A:\r\n");
A.printf(); A.printf();
}{ }{
double * dataA =new double[9]; double * dataA = Aurora::malloc(9);
double * dataB =new double[9]; double * dataB = Aurora::malloc(9);
for (int i = 0; i < 9; ++i) { for (int i = 0; i < 9; ++i) {
dataA[i]=(double)(i-3); dataA[i]=(double)(i-3);
dataB[i]=(double)(i+2); dataB[i]=(double)(i+2);

12
test/FunctionTester.cpp
View File

@@ -22,8 +22,8 @@ double fourDecimalRound(double src){
} }
TEST_F(FunctionTester, matrixSlice) { TEST_F(FunctionTester, matrixSlice) {
double * dataA =new double[8]; double * dataA =Aurora::malloc(8);
double * dataB =new double[8]; double * dataB =Aurora::malloc(8);
for (int i = 0; i < 8; ++i) { for (int i = 0; i < 8; ++i) {
dataA[i]=(double)(i-3); dataA[i]=(double)(i-3);
dataB[i]=(double)(i+2); dataB[i]=(double)(i+2);
@@ -42,8 +42,8 @@ TEST_F(FunctionTester, matrixSlice) {
} }
TEST_F(FunctionTester, sign) { TEST_F(FunctionTester, sign) {
double * dataA =new double[9]; double * dataA =Aurora::malloc(9);
double * dataB =new double[9]; double * dataB =Aurora::malloc(9);
for (int i = 0; i < 9; ++i) { for (int i = 0; i < 9; ++i) {
dataA[i]=(double)(i-3); dataA[i]=(double)(i-3);
dataB[i]=(double)(i+2); dataB[i]=(double)(i+2);
@@ -59,8 +59,8 @@ TEST_F(FunctionTester, sign) {
} }
TEST_F(FunctionTester, matrix) { TEST_F(FunctionTester, matrix) {
double * dataA =new double[9]; double * dataA =Aurora::malloc(9);
double * dataB =new double[9]; double * dataB =Aurora::malloc(9);
for (int i = 0; i < 9; ++i) { for (int i = 0; i < 9; ++i) {
dataA[i]=(double)(i+1); dataA[i]=(double)(i+1);
dataB[i]=(double)(i+2); dataB[i]=(double)(i+2);