!107 [sync] PR-106: 打开部分子包的回归测试
From: @openeuler-sync-bot Reviewed-by: @liqingqing_1229 Signed-off-by: @liqingqing_1229
This commit is contained in:
commit
1944d7ef95
40
boost-1.78-graph-Skip-performance-test.patch
Normal file
40
boost-1.78-graph-Skip-performance-test.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
From d65e2888de8097f28453b92fdd1770805c0f4063 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Liu Zixian <liuzixian4@huawei.com>
|
||||||
|
Date: Mon, 12 Dec 2022 12:36:42 +0800
|
||||||
|
Subject: [PATCH] Skip performance test
|
||||||
|
|
||||||
|
Performance test in CI does not make sense.
|
||||||
|
|
||||||
|
On x86-64, this test caused a float point exception,
|
||||||
|
for the test data is too weak to generate an execution time
|
||||||
|
larger than the timer precision.
|
||||||
|
|
||||||
|
[ 298s] ====== BEGIN OUTPUT ======
|
||||||
|
[ 298s] Generating graph...10000 vertices, 100000 edges.
|
||||||
|
[ 298s] Running Dijkstra's with binary heap... 0.003279s wall, 0.000000s user + 0.000000s system = 0.000000s CPU (n/a%)
|
||||||
|
[ 298s] seconds.
|
||||||
|
[ 298s] Running Dijkstra's with d-ary heap (d=4)...
|
||||||
|
[ 298s] EXIT STATUS: 136
|
||||||
|
[ 298s] ====== END OUTPUT ======
|
||||||
|
|
||||||
|
Signed-off-by: Liu Zixian <liuzixian4@huawei.com>
|
||||||
|
---
|
||||||
|
libs/graph/test/Jamfile.v2 | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libs/graph/test/Jamfile.v2 b/libs/graph/test/Jamfile.v2
|
||||||
|
index a0c15ca7b..a6273b659 100644
|
||||||
|
--- a/libs/graph/test/Jamfile.v2
|
||||||
|
+++ b/libs/graph/test/Jamfile.v2
|
||||||
|
@@ -47,7 +47,7 @@ alias graph_test_regular :
|
||||||
|
[ run undirected_dfs.cpp ]
|
||||||
|
[ compile dfs_cc.cpp ]
|
||||||
|
[ compile dijkstra_cc.cpp ]
|
||||||
|
- [ run dijkstra_heap_performance.cpp /boost/timer//boost_timer : 10000 ]
|
||||||
|
+ # [ run dijkstra_heap_performance.cpp /boost/timer//boost_timer : 10000 ]
|
||||||
|
[ run dijkstra_no_color_map_compare.cpp : 10000 ]
|
||||||
|
[ run disjoint_set_test.cpp ]
|
||||||
|
[ run dominator_tree_test.cpp ]
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
18
boost.spec
18
boost.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: boost
|
Name: boost
|
||||||
Version: 1.78.0
|
Version: 1.78.0
|
||||||
Release: 13
|
Release: 14
|
||||||
Summary: The free peer-reviewed portable C++ source libraries
|
Summary: The free peer-reviewed portable C++ source libraries
|
||||||
License: Boost Software License 1.0
|
License: Boost Software License 1.0
|
||||||
URL: http://www.boost.org
|
URL: http://www.boost.org
|
||||||
@ -28,6 +28,7 @@ Patch6: boost-1.78-filesystem-Use-O_NONBLOCK-instead-of-O_NDELAY.patch
|
|||||||
# https://github.com/boostorg/python/pull/373
|
# https://github.com/boostorg/python/pull/373
|
||||||
Patch9000: boost-1.78-python-Update-call_method-hpp.patch
|
Patch9000: boost-1.78-python-Update-call_method-hpp.patch
|
||||||
Patch9001: boost_1_78_0-sw.patch
|
Patch9001: boost_1_78_0-sw.patch
|
||||||
|
Patch9002: boost-1.78-graph-Skip-performance-test.patch
|
||||||
|
|
||||||
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
|
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
|
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
|
||||||
@ -66,7 +67,7 @@ BuildRequires: openssl-devel
|
|||||||
# optional libraries for iostreams
|
# optional libraries for iostreams
|
||||||
BuildRequires: bzip2-devel libzstd-devel xz-devel zlib-devel
|
BuildRequires: bzip2-devel libzstd-devel xz-devel zlib-devel
|
||||||
# optional library for multiprecision
|
# optional library for multiprecision
|
||||||
BuildRequires: libquadmath-devel
|
BuildRequires: libquadmath-devel libquadmath-static
|
||||||
# optional library for python3
|
# optional library for python3
|
||||||
BuildRequires: python3-numpy
|
BuildRequires: python3-numpy
|
||||||
# optional library for regex
|
# optional library for regex
|
||||||
@ -289,11 +290,15 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}).
|
|||||||
%define opt_feature release debug-symbols=on pch=off
|
%define opt_feature release debug-symbols=on pch=off
|
||||||
%define opt_libs --without-mpi --without-graph_parallel
|
%define opt_libs --without-mpi --without-graph_parallel
|
||||||
%define b2_options %{opt_build} %{opt_feature} %{opt_libs}
|
%define b2_options %{opt_build} %{opt_feature} %{opt_libs}
|
||||||
%define boost_macros BOOST_NO_AUTO_PTR
|
%define boost_macros define=BOOST_NO_AUTO_PTR define=BOOST_STATECHART_USE_NATIVE_RTTI
|
||||||
./b2 %{b2_options} cxxflags="$RPM_OPT_FLAGS" define=%{boost_macros}
|
./b2 %{b2_options} cxxflags="$RPM_OPT_FLAGS" %{boost_macros}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
:
|
cd status
|
||||||
|
../b2 %{?_smp_mflags} --check-libs-only
|
||||||
|
../b2 %{?_smp_mflags} %{opt_feature} cxxflags="$RPM_OPT_FLAGS" %{boost_macros} \
|
||||||
|
--include-tests=algorithm,graph,intrusive,dynamic_bitset,property_map,crc,lexical_cast,range \
|
||||||
|
--exclude-tests=mpi,graph_parallel
|
||||||
|
|
||||||
%install
|
%install
|
||||||
./b2 %{b2_options} \
|
./b2 %{b2_options} \
|
||||||
@ -443,6 +448,9 @@ find libs -name example -exec cp {} boost-example --parents -r \;
|
|||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 12 2022 Liu Zixian <liuzixian4@huawei.com> - 1.78.0-14
|
||||||
|
- backport master build commands and enable some regression test
|
||||||
|
|
||||||
* Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 1.78.0-13
|
* Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 1.78.0-13
|
||||||
- add sw64 patch
|
- add sw64 patch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user