diff --git a/src/AuroraDefs.h b/src/AuroraDefs.h index c0affee..748b5bd 100644 --- a/src/AuroraDefs.h +++ b/src/AuroraDefs.h @@ -16,5 +16,9 @@ namespace Aurora Row, All }; + enum ValueType{ + Normal=1, + Complex + }; } #endif //AURORA_AURORADEFS_H diff --git a/src/CudaMatrixPrivate.cu b/src/CudaMatrixPrivate.cu index d137416..1dbf25e 100644 --- a/src/CudaMatrixPrivate.cu +++ b/src/CudaMatrixPrivate.cu @@ -4,6 +4,7 @@ #include #include #include +#include "AuroraDefs.h" using namespace thrust::placeholders; struct PowOp: public thrust::unary_function{ diff --git a/src/Matrix.h b/src/Matrix.h index 1a59098..b0e4a52 100644 --- a/src/Matrix.h +++ b/src/Matrix.h @@ -4,13 +4,11 @@ #include #include #include +#include "AuroraDefs.h" namespace Aurora { - enum ValueType{ - Normal=1, - Complex - }; + const int $ = -1; class CudaMatrix; diff --git a/test/CudaMatrix_Test.cpp b/test/CudaMatrix_Test.cpp index ac82609..31dabf6 100644 --- a/test/CudaMatrix_Test.cpp +++ b/test/CudaMatrix_Test.cpp @@ -1,4 +1,6 @@ +#include #include +#include "AuroraDefs.h" #include "Matrix.h" #include "CudaMatrix.h" #include "Function.h"