From eecca44b380f75aceacb7e5051333151453df4a2 Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Fri, 28 Mar 2025 10:31:37 +0000
Subject: [PATCH 1/5] Update Pybind 2.10.4 -> 2.13.6
---
cmake/PybindModuleCreation.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/PybindModuleCreation.cmake b/cmake/PybindModuleCreation.cmake
index 8f386be..bab7fba 100644
--- a/cmake/PybindModuleCreation.cmake
+++ b/cmake/PybindModuleCreation.cmake
@@ -1,8 +1,8 @@
-function(generate_python_binding pybind_module_name target_to_bind)
+function(generate_python_binding pybind_module_name target_to_bind)
add_definitions(-DPYBIND)
Include(FetchContent)
- set(PYBIND_VERSION v2.10.4)
+ set(PYBIND_VERSION v2.13.6)
set(PYBIND11_FINDPYTHON ON)
message(STATUS "Retrieving pybind ${PYBIND_VERSION} from git")
--
GitLab
From f4e82ab862fcc08115e15921456a9468632a5c5c Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Thu, 10 Apr 2025 09:27:36 +0200
Subject: [PATCH 2/5] Use setBackend
---
include/aidge/backend/opencv/utils/Utils.hpp | 21 -----
src/database/MNIST.cpp | 4 +-
src/utils/Utils.cpp | 89 ++------------------
unit_tests/Tests_Utils.cpp | 12 +--
4 files changed, 17 insertions(+), 109 deletions(-)
diff --git a/include/aidge/backend/opencv/utils/Utils.hpp b/include/aidge/backend/opencv/utils/Utils.hpp
index 8825226..4858a2f 100644
--- a/include/aidge/backend/opencv/utils/Utils.hpp
+++ b/include/aidge/backend/opencv/utils/Utils.hpp
@@ -33,27 +33,6 @@ namespace Aidge {
*/
std::shared_ptr<Tensor> tensorOpencv(cv::Mat mat);
-/**
- * @brief Copy the data from a source 2D cv::mat to a destination pointer with an offset
- *
- * @tparam CV_T The standard type corresponding to the opencv data type
- * @param mat opencv 2D mat to copy the data from
- * @param data destination pointer
- * @param offset offset an the destination data pointer
- */
-template <class CV_T>
-void convert(const cv::Mat& mat, void* data, std::size_t offset);
-
-
-/**
- * @brief Convert a tensor backend opencv into a tensor backend cpu
- *
- * @param tensorOpencv tensor with backend opencv (contains a cv::mat)
- * @return std::shared_ptr<Tensor> tensor backend cpu (contains a std::vector)
- */
-std::shared_ptr<Tensor> convertCpu(std::shared_ptr<Aidge::Tensor> tensorOpencv);
-
-
} // namespace
#endif // AIDGE_OPENCV_UTILS_UTILS_H_
\ No newline at end of file
diff --git a/src/database/MNIST.cpp b/src/database/MNIST.cpp
index fd92f57..e8951d8 100644
--- a/src/database/MNIST.cpp
+++ b/src/database/MNIST.cpp
@@ -153,7 +153,9 @@ std::vector<std::shared_ptr<Aidge::Tensor>> Aidge::MNIST::getItem(const std::siz
std::vector<std::shared_ptr<Tensor>> item;
// Load the digit tensor
// TODO : Currently converts the tensor Opencv but this operation will be carried by a convert operator in the preprocessing graph
- item.push_back(Aidge::convertCpu((std::get<0>(mStimuli.at(index))).load()));
+ item.push_back((std::get<0>(mStimuli.at(index))).load());
+ item.back()->setBackend("cpu");
+ item.back()->setDataFormat(DataFormat::CHW);
// item.push_back((std::get<0>(mStimuli.at(index))).load());
// Load the label tensor
item.push_back((std::get<1>(mStimuli.at(index))).load());
diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index 9cfe4f1..0ea45a5 100644
--- a/src/utils/Utils.cpp
+++ b/src/utils/Utils.cpp
@@ -60,94 +60,19 @@ static Aidge::DataType CVtoAidge(const int matDepth) {
}
std::shared_ptr<Aidge::Tensor> Aidge::tensorOpencv(cv::Mat mat) {
- // Get Mat dims
- const std::vector<DimSize_t> matDims = std::vector<DimSize_t>({static_cast<DimSize_t>(mat.channels()),
- static_cast<DimSize_t>(mat.rows),
- static_cast<DimSize_t>(mat.cols)});
- // Get the correct Data Type
- Aidge::DataType type;
- type = CVtoAidge(mat.depth());
// Create tensor from the dims of the Cv::Mat
- std::shared_ptr<Tensor> tensor = std::make_shared<Tensor>(matDims);
- // Set beackend opencv
+ auto tensor = std::make_shared<Tensor>(std::vector<DimSize_t>{static_cast<DimSize_t>(mat.rows),
+ static_cast<DimSize_t>(mat.cols),
+ static_cast<DimSize_t>(mat.channels())});
+ // cv::Mat data format is always HWC
+ tensor->setDataFormat(DataFormat::HWC);
+ // Set backend opencv
tensor->setBackend("opencv");
// Set datatype
- tensor->setDataType(type);
+ tensor->setDataType(CVtoAidge(mat.depth()));
// Cast the tensorImpl to access setCvMat function
TensorImpl_opencv_* tImpl_opencv = dynamic_cast<TensorImpl_opencv_*>(tensor->getImpl().get());
tImpl_opencv->setCvMat(mat);
return tensor;
}
-
-
-template <class CV_T>
-void Aidge::convert(const cv::Mat& mat, void* data, std::size_t offset)
-{
- if (mat.isContinuous())
- std::memcpy(reinterpret_cast<void*>(reinterpret_cast<CV_T*>(data) + offset), mat.ptr<CV_T>(), sizeof(CV_T)*(mat.cols*mat.rows));
- else {
- throw std::runtime_error(
- "Poui pwoup convert not support if matrix not contiguous");
- }
-
-}
-
-
-std::shared_ptr<Aidge::Tensor> Aidge::convertCpu(std::shared_ptr<Aidge::Tensor> tensorOpencv){
- // Assert the tensorOpencv is backend Opencv
- AIDGE_ASSERT(tensorOpencv->getImpl()->backend() == "opencv", "Cannot convert tensor backend from opencv to cpu : tensor is not backend opencv.");
-
- // Create a tensor backend cpu from the dimensions of the tensor backend opencv
- std::shared_ptr<Aidge::Tensor> tensorCpu = std::make_shared<Aidge::Tensor>(tensorOpencv->dims());
-
- // Get the cv::Mat from the tensor backend Opencv
- Aidge::TensorImpl_opencv_* tImplOpencv = dynamic_cast<Aidge::TensorImpl_opencv_*>(tensorOpencv->getImpl().get());
- cv::Mat dataOpencv = tImplOpencv->data();
-
- // Convert the cv::Mat into a vector of cv::Mat (vector of channels)
- std::vector<cv::Mat> channels;
- cv::split(dataOpencv, channels);
-
- // set the datatype of the cpu tensor
- tensorCpu->setDataType(CVtoAidge(channels[0].depth()));
-
- // Set backend cpu
- tensorCpu->setBackend("cpu");
-
- // Convert & copy the cv::Mat into the tensor using the rawPtr of tensor cpu
- std::size_t count = 0;
- for (std::vector<cv::Mat>::const_iterator itChannel = channels.cbegin();
- itChannel != channels.cend();
- ++itChannel)
- {
- switch ((*itChannel).depth()) {
- 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_16U:
- convert<unsigned short>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
- break;
- case CV_16S:
- convert<short>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
- break;
- case CV_32S:
- convert<int>(*itChannel, tensorCpu->getImpl()->rawPtr(), count*static_cast<std::size_t>((*itChannel).rows*(*itChannel).cols));
- break;
- 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;
- default:
- throw std::runtime_error(
- "Cannot convert cv::Mat to Tensor: incompatible types.");
- }
- ++count;
- }
- return tensorCpu;
-}
diff --git a/unit_tests/Tests_Utils.cpp b/unit_tests/Tests_Utils.cpp
index 28a697b..f7094b2 100644
--- a/unit_tests/Tests_Utils.cpp
+++ b/unit_tests/Tests_Utils.cpp
@@ -61,9 +61,9 @@ TEMPLATE_TEST_CASE("Opencv Utils", "[Utils][OpenCV]", signed char, unsigned char
auto tensorOcv = tensorOpencv(mat);
// Check the size of the tensor
- REQUIRE(mat.channels() == tensorOcv->dims()[0]);
- REQUIRE(mat.rows == tensorOcv->dims()[1]);
- REQUIRE(mat.cols == tensorOcv->dims()[2]);
+ REQUIRE(mat.rows == tensorOcv->dims()[0]);
+ REQUIRE(mat.cols == tensorOcv->dims()[1]);
+ REQUIRE(mat.channels() == tensorOcv->dims()[2]);
//Get the matrix inside the tensor
@@ -74,10 +74,12 @@ TEMPLATE_TEST_CASE("Opencv Utils", "[Utils][OpenCV]", signed char, unsigned char
cv::split(mat_tensor, channels_split);
// Convert opencv tensor to cpu tensor
- auto tensorCpu = convertCpu(tensorOcv);
+ auto tensorCpu = tensorOcv->clone();
+ tensorCpu.setBackend("cpu");
+ tensorCpu.setDataFormat(DataFormat::CHW);
// Get the cpu ptr of the converted tensor
- auto cpu_ptr = static_cast<TestType*>(tensorCpu->getImpl()->rawPtr());
+ auto cpu_ptr = static_cast<TestType*>(tensorCpu.getImpl()->rawPtr());
// Compare the tensor cpu values with the cv mat in an elementwise fashion
// Loop over channels
--
GitLab
From bffb0447c71458dcc229bea49be4a0d2ab83ff7c Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Tue, 22 Apr 2025 11:04:00 +0000
Subject: [PATCH 3/5] Update 0.1.5 -> 0.1.6
---
version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/version.txt b/version.txt
index 9faa1b7..c946ee6 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.1.5
+0.1.6
--
GitLab
From a3c8f29953340cefcb1ceaa32b01364beb7b2554 Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Thu, 24 Apr 2025 08:40:38 +0000
Subject: [PATCH 4/5] Add option -DPYBIND11_FINDPYTHON=ON.
---
setup.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup.py b/setup.py
index 6e8ed89..f93cd3e 100644
--- a/setup.py
+++ b/setup.py
@@ -82,6 +82,7 @@ class CMakeBuild(build_ext):
f"-DCMAKE_CXX_COMPILER={cxx_compiler}",
f"-DENABLE_ASAN={asan}",
"-DPYBIND=ON",
+ "-DPYBIND11_FINDPYTHON=ON",
"-DCMAKE_EXPORT_COMPILE_COMMANDS=1",
"-DCOVERAGE=OFF",
]
--
GitLab
From 8e74f46d42190fb2793b0568e9567b3732e4a2a7 Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Thu, 24 Apr 2025 08:41:02 +0000
Subject: [PATCH 5/5] Update minimum version to python 3.10
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index d0176c5..8b1dd46 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ description="Opencv implementations of the operators and tensor of aidge framewo
dependencies = [
"numpy>=1.21.6",
]
-requires-python = ">= 3.8"
+requires-python = ">= 3.10"
dynamic = ["version"] # defined by pbr
readme = "README.md"
license = { file = "LICENSE" }
--
GitLab