Codebase list ignition-math / fe637e3
Rediff patches Drop 0005-fix-negative-zero-value.patch: not needed anymore Drop 0004-Check-expected-string-in-architectures-that-fail-wit.patch: merged upstream Drop 0007-fix-spherical-coors-expectations.patch: merged upstream Jose Luis Rivero 8 months ago
9 changed file(s) with 68 addition(s) and 131 deletion(s). Raw diff Collapse all Expand all
+1
-1
debian/patches/0001-limits-rolling.patch less more
77 1 file changed, 1 insertion(+)
88
99 diff --git a/src/RollingMean.cc b/src/RollingMean.cc
10 index 3510d06..e30890e 100644
10 index 7f7e21e..693ec0b 100644
1111 --- a/src/RollingMean.cc
1212 +++ b/src/RollingMean.cc
1313 @@ -15,6 +15,7 @@
+1
-1
debian/patches/0002_use_system_gtest.patch less more
77 1 file changed, 4 insertions(+), 4 deletions(-)
88
99 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
10 index 0355302..0b35e8e 100644
10 index 58e07fd..5ee7092 100644
1111 --- a/test/CMakeLists.txt
1212 +++ b/test/CMakeLists.txt
1313 @@ -1,6 +1,6 @@
+11
-3
debian/patches/0003-fix-axisalignedbox-expectations.patch less more
0 Description: Test is broken on i386
10 From: Jose Luis Rivero <jrivero@osrfoundation.org>
1 Date: Thu, 10 Aug 2023 08:44:13 +0000
2 Subject: Test is broken on i386
3
24 Last-Update: 2022-02-07
35 Forwarded: https://github.com/ignitionrobotics/ign-math/issues/375
6 ---
7 src/AxisAlignedBox_TEST.cc | 2 ++
8 1 file changed, 2 insertions(+)
9
10 diff --git a/src/AxisAlignedBox_TEST.cc b/src/AxisAlignedBox_TEST.cc
11 index 79116cc..16a9ad2 100644
412 --- a/src/AxisAlignedBox_TEST.cc
513 +++ b/src/AxisAlignedBox_TEST.cc
6 @@ -375,6 +375,7 @@
14 @@ -375,6 +375,7 @@ TEST(AxisAlignedBoxTest, OperatorStreamOut)
715 EXPECT_EQ(stream.str(), "Min[0.1 1.2 2.3] Max[1.1 2.2 4.3]");
816 }
917
1119 /////////////////////////////////////////////////
1220 TEST(AxisAlignedBoxTest, Intersect)
1321 {
14 @@ -591,6 +592,7 @@
22 @@ -591,6 +592,7 @@ TEST(AxisAlignedBoxTest, Intersect)
1523 Vector3d(-0.707107, 0, -0.707107), 0, 1000)), dist, 1e-5);
1624 EXPECT_EQ(pt, Vector3d(1, 0, 0.3));
1725 }
+0
-25
debian/patches/0004-Check-expected-string-in-architectures-that-fail-wit.patch less more
0 From: Jose Luis Rivero <jrivero@osrfoundation.org>
1 Date: Tue, 8 Sep 2020 01:43:35 +0200
2 Subject: Check expected string in architectures that fail with negative zero
3 due to optimizations
4
5 ---
6 src/Pose_TEST.cc | 5 ++++-
7 1 file changed, 4 insertions(+), 1 deletion(-)
8
9 diff --git a/src/Pose_TEST.cc b/src/Pose_TEST.cc
10 index 3313ba1..eb2350f 100644
11 --- a/src/Pose_TEST.cc
12 +++ b/src/Pose_TEST.cc
13 @@ -184,7 +184,10 @@ TEST(PoseTest, OperatorStreamOut)
14 math::Pose3d p(0.1, 1.2, 2.3, 0.0, 0.1, 1.0);
15 std::ostringstream stream;
16 stream << p;
17 - EXPECT_EQ(stream.str(), "0.1 1.2 2.3 0 0.1 1");
18 + // some compiler optimizations returns negative zero (-0) in the stream, workaround
19 + // using prefix and postfix check. Not nice I know.
20 + EXPECT_TRUE(stream.str().find("0.1 1.2 2.3") != std::string::npos) << "stream.str is: " << stream.str();
21 + EXPECT_TRUE(stream.str().find("0 0.1 1") != std::string::npos) << "stream.str is: " << stream.str();
22 }
23
24 /////////////////////////////////////////////////
+0
-26
debian/patches/0005-fix-negative-zero-value.patch less more
0 Description: Fix zero negative value comparison
1 The problem appeared before, when comparing strings that comes from a zero
2 value in maths, the optimizations in some platforms return a negative zero
3 making the comparison to fail. The workaround is to compare the two substrings
4 around the zero
5 Author: Jose Luis Rivero <jrivero@osrfoundation.org>
6 Forwarded: https://github.com/ignitionrobotics/ign-math/pull/374
7 Last-Update: 2022-02-07
8 --- a/src/OrientedBox_TEST.cc
9 +++ b/src/OrientedBox_TEST.cc
10 @@ -331,8 +331,13 @@
11 Pose3d(3.4, 4.5, 5.6, 0.0, -0.1, 0.2));
12 std::ostringstream stream;
13 stream << b;
14 - EXPECT_EQ(stream.str(),
15 - "Size[0.1 1.2 2.3] Pose[3.4 4.5 5.6 0 -0.1 0.2] Material[]");
16 +
17 + // some compiler optimizations returns negative zero (-0) in the stream, workaround
18 + // using prefix and postfix check. Not nice I know
19 + EXPECT_TRUE(stream.str().find("Size[0.1 1.2 2.3] Pose[3.4 4.5 5.6") != std::string::npos) <<
20 + "stream.str is: " << stream.str();
21 + EXPECT_TRUE(stream.str().find("0 -0.1 0.2] Material[]") != std::string::npos) <<
22 + "stream.str is: " << stream.str();
23 }
24
25 //////////////////////////////////////////////////
+14
-6
debian/patches/0006-make-Python-version-available-for-pybuild.patch less more
0 Description: Right debian path for python installation
1 Author: Jose Luis Rivero <jrivero@osrfoundation.org>
0 From: Jose Luis Rivero <jrivero@osrfoundation.org>
1 Date: Thu, 10 Aug 2023 08:44:13 +0000
2 Subject: Right debian path for python installation
3
24 Forwarded: no
35 Last-Update: 2022-02-04
6
7 Last-Update: 2022-02-04
48 ---
5 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
9 src/python_pybind11/CMakeLists.txt | 28 +++-------------------------
10 1 file changed, 3 insertions(+), 25 deletions(-)
11
12 diff --git a/src/python_pybind11/CMakeLists.txt b/src/python_pybind11/CMakeLists.txt
13 index 6a242c4..098eaee 100644
614 --- a/src/python_pybind11/CMakeLists.txt
715 +++ b/src/python_pybind11/CMakeLists.txt
8 @@ -35,30 +35,8 @@
16 @@ -55,30 +55,8 @@ target_link_libraries(math PRIVATE
917 ${PROJECT_LIBRARY_TARGET_NAME}
1018 )
1119
3846
3947 set(IGN_PYTHON_INSTALL_PATH "${IGN_PYTHON_INSTALL_PATH}/ignition")
4048
41 @@ -128,7 +106,7 @@
42 "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/src/python_pybind11/test/${test}.py")
49 @@ -171,7 +149,7 @@ if(NOT(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm"))
50 endif()
4351
4452 set(_env_vars)
4553 - list(APPEND _env_vars "PYTHONPATH=${FAKE_INSTALL_PREFIX}/lib/python/")
+0
-28
debian/patches/0007-fix-spherical-coors-expectations.patch less more
0 Description: Relax testing expectations of SphericalCoordinates
1 EXPECT_DOUBLE_EQ is not working as expected in i386
2 relax expectation with 1e-6 error margin
3 Author: Jose Luis Rivero <jrivero@osrfoundation.org>
4 Forwarded: https://github.com/ignitionrobotics/ign-math/pull/374
5 Last-Update: 2022-02-07
6 ---
7 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8 --- a/src/SphericalCoordinates_TEST.cc
9 +++ b/src/SphericalCoordinates_TEST.cc
10 @@ -448,7 +448,7 @@
11 auto latLonAlt = sc.SphericalFromLocalPosition({0, 0, 0});
12 EXPECT_DOUBLE_EQ(lat.Degree(), latLonAlt.X());
13 EXPECT_DOUBLE_EQ(lon.Degree(), latLonAlt.Y());
14 - EXPECT_DOUBLE_EQ(elev, latLonAlt.Z());
15 + EXPECT_NEAR(elev, latLonAlt.Z(), 1e-6);
16
17 auto xyzOrigin = sc.LocalFromSphericalPosition(latLonAlt);
18 EXPECT_EQ(math::Vector3d::Zero, xyzOrigin);
19 @@ -556,7 +556,7 @@
20 auto latLonAlt = sc.SphericalFromLocalPosition({0, 0, 0});
21 EXPECT_DOUBLE_EQ(lat.Degree(), latLonAlt.X());
22 EXPECT_DOUBLE_EQ(lon.Degree(), latLonAlt.Y());
23 - EXPECT_DOUBLE_EQ(elev, latLonAlt.Z());
24 + EXPECT_NEAR(elev, latLonAlt.Z(), 1e-6);
25
26 auto xyzOrigin = sc.LocalFromSphericalPosition(latLonAlt);
27 EXPECT_EQ(math::Vector3d::Zero, xyzOrigin);
+41
-38
debian/patches/0008-limit-build-threads-and-log-fake-install.patch less more
0 Description: limit compilation threads in fake install and enable log
1 arm* and mipsel fail to compile the FAKE example. Probably caused
2 by high memory consumption. Remove from there.
3 Author: Jose Luis Rivero <jrivero@osrfoundation.org>
0 From: Jose Luis Rivero <jrivero@osrfoundation.org>
1 Date: Thu, 10 Aug 2023 08:44:13 +0000
2 Subject: limit compilation threads in fake install and enable log
3
44 Forwarded: not-needed
5 Last-Update: 2023-08-10
6
7 arm* and mipsel fail to compile the FAKE example. Probably caused
8 by high memory consumption. Remove from there.
59 Last-Update: 2022-02-18
610 ---
7 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
11 src/python_pybind11/CMakeLists.txt | 1 +
12 src/ruby/CMakeLists.txt | 2 ++
13 test/CMakeLists.txt | 9 ++++++---
14 3 files changed, 9 insertions(+), 3 deletions(-)
15
16 --- a/src/python_pybind11/CMakeLists.txt
17 +++ b/src/python_pybind11/CMakeLists.txt
18 @@ -159,7 +159,9 @@
19 message("")
20 message(WARNING "Pytest package not available: ${PYTEST_error}")
21 endif()
22 +endif()
23
24 +if(NOT(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm"))
25 foreach (test ${python_tests})
26 if (pytest_FOUND)
27 add_test(NAME ${test}.py COMMAND
28 --- a/src/ruby/CMakeLists.txt
29 +++ b/src/ruby/CMakeLists.txt
30 @@ -80,6 +80,7 @@
31 set(IGN_RUBY_INSTALL_PATH "${IGN_RUBY_INSTALL_PATH}/ignition")
32 install(TARGETS ${SWIG_RB_LIB} DESTINATION ${IGN_RUBY_INSTALL_PATH})
33
34 + if(NOT(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm"))
35 # Add the ruby tests
36 set(_env_vars)
37 list(APPEND _env_vars "LD_LIBRARY_PATH=${FAKE_INSTALL_PREFIX}/lib:$ENV{LD_LIBRARY_PATH}")
38 @@ -90,4 +91,5 @@
39 set_tests_properties(${test}.rb PROPERTIES
40 ENVIRONMENT "${_env_vars}")
41 endforeach()
42 + endif()
43 endif()
844 --- a/test/CMakeLists.txt
945 +++ b/test/CMakeLists.txt
1046 @@ -20,6 +20,7 @@
3571 +endif()
3672 add_subdirectory(performance)
3773 add_subdirectory(regression)
38 --- a/src/python_pybind11/CMakeLists.txt
39 +++ b/src/python_pybind11/CMakeLists.txt
40 @@ -123,6 +123,7 @@
41 Vector4_TEST
42 )
43
44 + if(NOT(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm"))
45 foreach (test ${python_tests})
46 add_test(NAME ${test}.py COMMAND
47 "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/src/python_pybind11/test/${test}.py")
48 @@ -133,5 +134,6 @@
49 set_tests_properties(${test}.py PROPERTIES
50 ENVIRONMENT "${_env_vars}")
51 endforeach()
52 + endif()
53
54 endif()
55 --- a/src/ruby/CMakeLists.txt
56 +++ b/src/ruby/CMakeLists.txt
57 @@ -80,6 +80,7 @@
58 set(IGN_RUBY_INSTALL_PATH "${IGN_RUBY_INSTALL_PATH}/ignition")
59 install(TARGETS ${SWIG_RB_LIB} DESTINATION ${IGN_RUBY_INSTALL_PATH})
60
61 + if(NOT(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm"))
62 # Add the ruby tests
63 set(_env_vars)
64 list(APPEND _env_vars "LD_LIBRARY_PATH=${FAKE_INSTALL_PREFIX}/lib:$ENV{LD_LIBRARY_PATH}")
65 @@ -90,4 +91,5 @@
66 set_tests_properties(${test}.rb PROPERTIES
67 ENVIRONMENT "${_env_vars}")
68 endforeach()
69 + endif()
70 endif()
+0
-3
debian/patches/series less more
0 0007-fix-spherical-coors-expectations.patch
10 0008-limit-build-threads-and-log-fake-install.patch
21 0003-fix-axisalignedbox-expectations.patch
3 0005-fix-negative-zero-value.patch
42 0006-make-Python-version-available-for-pybuild.patch
53 0001-limits-rolling.patch
64 0002_use_system_gtest.patch
75 0002-Disable-symbol-test.patch
8 0004-Check-expected-string-in-architectures-that-fail-wit.patch