diff --git a/src/Function1D.cu b/src/Function1D.cu index df54c33..3d5e121 100644 --- a/src/Function1D.cu +++ b/src/Function1D.cu @@ -5,6 +5,7 @@ #include "Matrix.h" #include +#include #include #include #include @@ -1232,3 +1233,23 @@ CudaMatrix Aurora::linspaceCuda(float aStart, float aEnd, int aNum) cudaDeviceSynchronize(); return Aurora::CudaMatrix::fromRawData(data,aNum); } + +CudaMatrix Aurora::auroraUnion(const CudaMatrix& aMatrix1, const CudaMatrix& aMatrix2) +{ + if(aMatrix1.isNull() || aMatrix2.isNull() || aMatrix1.isComplex() || aMatrix2.isComplex()) + { + std::cerr<<"auroraUnion not support complex cudamatrix"<