diff --git a/cmake/PybindModuleCreation.cmake b/cmake/PybindModuleCreation.cmake index 8f386bef59ed86dfa366eca5d4fccae24b28d24e..bab7fba26fab530a54b6b0c380b76126f0326e5f 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") diff --git a/unit_tests/loss/classification/Test_BCE.cpp b/unit_tests/loss/classification/Test_BCE.cpp index 34149f3a080e37069b6fd61a6935d2dbcb0e6cbd..9190e81012d0a530e677822a973847a0bbeff72e 100644 --- a/unit_tests/loss/classification/Test_BCE.cpp +++ b/unit_tests/loss/classification/Test_BCE.cpp @@ -93,7 +93,8 @@ TEST_CASE("[loss/classification] BCE", "[loss][classification][BCE]") { // compare results Tensor res_manual_tensor = Tensor(res_manual); - REQUIRE(approxEq<float>(res_manual, res_function)); + res_manual_tensor.resize({1, 1}); + REQUIRE(approxEq<float>(res_manual_tensor, res_function)); } } #if USE_AIDGE_BACKEND_CUDA @@ -154,7 +155,9 @@ TEST_CASE("[loss/classification] BCE", "[loss][classification][BCE]") { const Tensor res_function = loss::BCE(pred_tensor, targ_tensor); // compare results - REQUIRE(approxEq<float>(res_manual, res_function)); + Tensor res_manual_tensor = Tensor(res_manual); + res_manual_tensor.resize({1, 1}); + REQUIRE(approxEq<float>(res_manual_tensor, res_function)); cudaFree(d_pred); cudaFree(d_targ); diff --git a/unit_tests/loss/classification/Test_CELoss.cpp b/unit_tests/loss/classification/Test_CELoss.cpp index 2a0196560c78f468150871d7db491e7d5537ea0b..74c61133a74cb982e21d2e34cef1c78b883ab5b6 100644 --- a/unit_tests/loss/classification/Test_CELoss.cpp +++ b/unit_tests/loss/classification/Test_CELoss.cpp @@ -121,7 +121,8 @@ TEST_CASE("[loss/classification] CELoss", "[loss][classification][CELoss]") { // Compute the CELoss manually - const Tensor manualResult = Tensor(manualCELoss(predictionArray, targetArray, batchSize, outputSize)); + Tensor manualResult = Tensor(manualCELoss(predictionArray, targetArray, batchSize, outputSize)); + manualResult.resize({1, 1}); // Compute the CELoss using Aidge::loss::CELoss function @@ -183,7 +184,8 @@ TEST_CASE("[loss/classification] CELoss", "[loss][classification][CELoss]") { // Compute the CELoss manually - const Tensor manualResult = Tensor(manualCELoss(predictionArray, targetArray, batchSize, outputSize)); + Tensor manualResult = Tensor(manualCELoss(predictionArray, targetArray, batchSize, outputSize)); + manualResult.resize({1, 1}); // Compute the CELoss using Aidge::loss::CELoss function diff --git a/unit_tests/loss/regression/Test_MSE.cpp b/unit_tests/loss/regression/Test_MSE.cpp index adf4aa328fa5e2fe635b7d3983ee6267fe57f82a..dd40800a68f32875067ee358621ab377785cb440 100644 --- a/unit_tests/loss/regression/Test_MSE.cpp +++ b/unit_tests/loss/regression/Test_MSE.cpp @@ -94,7 +94,8 @@ TEST_CASE("[loss/regression] MSE", "[loss][regression][MSE]") { // compare results Tensor res_manual_tensor = Tensor(res_manual); - REQUIRE(approxEq<float>(res_manual, res_function)); + res_manual_tensor.resize({1, 1}); + REQUIRE(approxEq<float>(res_manual_tensor, res_function)); } } #if USE_AIDGE_BACKEND_CUDA @@ -153,7 +154,8 @@ TEST_CASE("[loss/regression] MSE", "[loss][regression][MSE]") { // compare results Tensor res_manual_tensor = Tensor(res_manual); - REQUIRE(approxEq<float>(res_manual, res_function)); + res_manual_tensor.resize({1, 1}); + REQUIRE(approxEq<float>(res_manual_tensor, res_function)); cudaFree(d_pred); cudaFree(d_targ); diff --git a/unit_tests/metrics/Test_Accuracy.cpp b/unit_tests/metrics/Test_Accuracy.cpp index d58076d7a1edd1be254972a67aec42cbf02753b0..3f25fb26cef9b5c4fea0cb04bf3a39a6f20e5e20 100644 --- a/unit_tests/metrics/Test_Accuracy.cpp +++ b/unit_tests/metrics/Test_Accuracy.cpp @@ -100,6 +100,7 @@ TEST_CASE("[metrics] Accuracy", "[metrics][Accuracy]") { // compare results Tensor res_manual_tensor = Tensor(accuracy); + res_manual_tensor.resize({1, 1}); REQUIRE(approxEq<float>(res_manual_tensor, res_function)); } } @@ -168,6 +169,7 @@ TEST_CASE("[metrics] Accuracy", "[metrics][Accuracy]") { // compare results Tensor res_manual_tensor = Tensor(accuracy); + res_manual_tensor.resize({1, 1}); REQUIRE(approxEq<float>(res_manual_tensor, res_function)); cudaFree(d_pred);