Merge branch 'dtof' of http://192.168.1.9:3000/Bug/Aurora into dtof

This commit is contained in:
sunwen
2023-11-27 09:48:59 +08:00
5 changed files with 475 additions and 7 deletions

View File

@@ -51,7 +51,7 @@ float CudaMatrix::getScalar() const
{
if (isNull()) return 0.0;
if (isNull()) return 0.0;
return getData()[0];
return getValue(0);
}
bool CudaMatrix::isVector() const
@@ -916,5 +916,171 @@ bool CudaMatrix::setBlock(int aDim,int aBeginIndex, int aEndIndex, const CudaMat
unaryNeg(aMatrix.getData(),out.getData(),aMatrix.getDataSize());
return out;
}
//----compare---------------------------------------------------
CudaMatrix CudaMatrix::operator>(float aScalar) const{
float* data = nullptr;
unsigned long long size = this->getDataSize() * this->getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, this->getDimSize(0), this->getDimSize(1), this->getDimSize(2), this->getValueType());
unaryCompare(this->getData(),aScalar,data,this->getDataSize(),::G);
return out;
}
CudaMatrix operator>(float aScalar, const CudaMatrix &aMatrix){
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(aScalar,aMatrix.getData(),data,aMatrix.getDataSize(),::G);
return out;
}
CudaMatrix CudaMatrix::operator>(const CudaMatrix &aMatrix) const{
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(this->getData(),aMatrix.getData(),data,this->getDataSize(),::G);
return out;
}
CudaMatrix CudaMatrix::operator<(float aScalar) const{
float* data = nullptr;
unsigned long long size = this->getDataSize() * this->getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, this->getDimSize(0), this->getDimSize(1), this->getDimSize(2), this->getValueType());
unaryCompare(this->getData(),aScalar,data,this->getDataSize(),::L);
return out;
}
CudaMatrix operator<(float aScalar, const CudaMatrix &aMatrix){
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(aScalar,aMatrix.getData(),data,aMatrix.getDataSize(),::L);
return out;
}
CudaMatrix CudaMatrix::operator<(const CudaMatrix &aMatrix) const{
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(this->getData(),aMatrix.getData(),data,this->getDataSize(),::L);
return out;
}
CudaMatrix CudaMatrix::operator>=(float aScalar) const{
float* data = nullptr;
unsigned long long size = this->getDataSize() * this->getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, this->getDimSize(0), this->getDimSize(1), this->getDimSize(2), this->getValueType());
unaryCompare(this->getData(),aScalar,data,this->getDataSize(),::GE);
return out;
}
CudaMatrix operator>=(float aScalar, const CudaMatrix &aMatrix){
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(aScalar,aMatrix.getData(),data,aMatrix.getDataSize(),::GE);
return out;
}
CudaMatrix CudaMatrix::operator>=(const CudaMatrix &aMatrix) const{
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(this->getData(),aMatrix.getData(),data,this->getDataSize(),::GE);
return out;
}
CudaMatrix CudaMatrix::operator<=(float aScalar) const{
float* data = nullptr;
unsigned long long size = this->getDataSize() * this->getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, this->getDimSize(0), this->getDimSize(1), this->getDimSize(2), this->getValueType());
unaryCompare(this->getData(),aScalar,data,this->getDataSize(),::LE);
return out;
}
CudaMatrix operator<=(float aScalar, const CudaMatrix &aMatrix){
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(aScalar,aMatrix.getData(),data,aMatrix.getDataSize(),::LE);
return out;
}
CudaMatrix CudaMatrix::operator<=(const CudaMatrix &aMatrix) const{
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(this->getData(),aMatrix.getData(),data,this->getDataSize(),::LE);
return out;
}
CudaMatrix CudaMatrix::operator==(float aScalar) const{
float* data = nullptr;
unsigned long long size = this->getDataSize() * this->getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, this->getDimSize(0), this->getDimSize(1), this->getDimSize(2), this->getValueType());
unaryCompare(this->getData(),aScalar,data,this->getDataSize(),::E);
return out;
}
CudaMatrix operator==(float aScalar, const CudaMatrix &aMatrix){
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(aScalar,aMatrix.getData(),data,aMatrix.getDataSize(),::E);
return out;
}
CudaMatrix CudaMatrix::operator==(const CudaMatrix &aMatrix) const{
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(this->getData(),aMatrix.getData(),data,this->getDataSize(),::E);
return out;
}
CudaMatrix CudaMatrix::operator!=(float aScalar) const{
float* data = nullptr;
unsigned long long size = this->getDataSize() * this->getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, this->getDimSize(0), this->getDimSize(1), this->getDimSize(2), this->getValueType());
unaryCompare(this->getData(),aScalar,data,this->getDataSize(),::NE);
return out;
}
CudaMatrix operator!=(float aScalar, const CudaMatrix &aMatrix){
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(aScalar,aMatrix.getData(),data,aMatrix.getDataSize(),::NE);
return out;
}
CudaMatrix CudaMatrix::operator!=(const CudaMatrix &aMatrix) const{
float* data = nullptr;
unsigned long long size = aMatrix.getDataSize() * aMatrix.getValueType();
cudaMalloc((void**)&data, sizeof(float) * size);
auto out = CudaMatrix::fromRawData(data, aMatrix.getDimSize(0), aMatrix.getDimSize(1), aMatrix.getDimSize(2), aMatrix.getValueType());
unaryCompare(this->getData(),aMatrix.getData(),data,this->getDataSize(),::NE);
return out;
}
float CudaMatrix::getValue(size_t index){
float result;
cudaError_t cuda_error = cudaMemcpy(&result, getData() + index, sizeof(float), cudaMemcpyDeviceToHost);
if (cuda_error != cudaSuccess) {
fprintf(stderr, "CUDA error: %s\n", cudaGetErrorString(cuda_error));
return nan("");
}
return result;
}
void CudaMatrix::setValue(size_t index, const float& value){
cudaError_t cuda_error = cudaMemcpy( getData() + index,&value, sizeof(float), cudaMemcpyHostToDevice);
if (cuda_error != cudaSuccess) {
fprintf(stderr, "CUDA error: %s\n", cudaGetErrorString(cuda_error));
}
}
}
#endif // USE_CUDA