Skip to content
Snippets Groups Projects
Commit a57953ae authored by Thibault Allenet's avatar Thibault Allenet
Browse files

Add double and char cases for tensor creation and convertion functions

parent 3dd2b548
No related branches found
No related tags found
No related merge requests found
......@@ -33,9 +33,9 @@ std::shared_ptr<Aidge::Tensor> Aidge::convertCpu(std::shared_ptr<Aidge::Tensor>
case CV_8U:
tensorCpu->setDataType(Aidge::DataType::UInt8);
break;
// case CV_8S:
// tensorCpu->setDataType(Aidge::DataType::Int8);
// break;
case CV_8S:
tensorCpu->setDataType(Aidge::DataType::Int8);
break;
case CV_16U:
tensorCpu->setDataType(Aidge::DataType::UInt16);
break;
......@@ -48,9 +48,9 @@ std::shared_ptr<Aidge::Tensor> Aidge::convertCpu(std::shared_ptr<Aidge::Tensor>
case CV_32F:
tensorCpu->setDataType(Aidge::DataType::Float32);
break;
// case CV_64F:
// tensorCpu->setDataType(Aidge::DataType::Float64);
// break;
case CV_64F:
tensorCpu->setDataType(Aidge::DataType::Float64);
break;
default:
throw std::runtime_error(
"Cannot convert cv::Mat to Tensor: incompatible types.");
......@@ -69,9 +69,9 @@ std::shared_ptr<Aidge::Tensor> Aidge::convertCpu(std::shared_ptr<Aidge::Tensor>
case CV_8U:
convert<unsigned char>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
break;
// case CV_8S:
// convert<char>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
// break;
case CV_8S:
convert<char>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
break;
case CV_16U:
convert<unsigned short>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
break;
......@@ -84,9 +84,9 @@ std::shared_ptr<Aidge::Tensor> Aidge::convertCpu(std::shared_ptr<Aidge::Tensor>
case CV_32F:
convert<float>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
break;
// case CV_64F:
// convert<double>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
// break;
case CV_64F:
convert<double>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
break;
default:
throw std::runtime_error(
"Cannot convert cv::Mat to Tensor: incompatible types.");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment