8eefb7f173
Merge branch 'master' into pr/lrineau/8273
2025-02-07 16:10:52 +01:00
bc44c91536
add a benchmark for Polyline_simplification_2
...
Using the tool `compare.py` from [Google Benchmark Tools][1]...
[1]: https://github.com/google/benchmark/blob/main/docs/tools.md
...given that:
- `benchmark_simplify-AFTER` is the file `benchmark_simplify.cpp`
compiled from this branch, and flags `-msse3 -DNDEBUG -O3`
with gcc version 14.2.1,
- `benchmark_simplify-BEFORE` is the same file
compiled from the branch `master`, and same flags and compiler.
the command line was:
```shell
compare.py benchmarks build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-BEFORE build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-AFTER Data/data/wkt/norway-MP.wkt --benchmark_repetitions=20 --benchmark_counters_tabular=true --benchmark_time_unit=s
```
The following results show that there is a speedup
of about 15% (mean) or 18% (median)
```
RUNNING: build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-BEFORE Data/data/wkt/norway-MP.wkt --benchmark_repetitions=20 --benchmark_counters_tabular=true --benchmark_time_unit=s --benchmark_out=/tmp/tmpvxyq_i24
2025-02-06T17:23:08+01:00
Running Data/data/wkt/norway-MP.wkt
Run on (16 X 800 MHz CPU s)
CPU Caches:
L1 Data 48 KiB (x8)
L1 Instruction 32 KiB (x8)
L2 Unified 1280 KiB (x8)
L3 Unified 24576 KiB (x1)
Load Average: 1.47, 2.07, 1.65
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Benchmark Time CPU Iterations #points #polygons #polylines nb of constraints nb of sub-constraints nb of vertices
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
simplify file Data/data/wkt/norway-MP.wkt 0.067 s 0.067 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.066 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.065 s 0.065 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.073 s 0.072 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.066 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.067 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.071 s 0.071 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.074 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.066 s 0.066 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.075 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.074 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.076 s 0.076 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.078 s 0.078 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.074 s 0.074 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.067 s 0.067 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.064 s 0.064 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.069 s 0.069 s 12 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_mean 0.069 s 0.069 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_median 0.067 s 0.067 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_stddev 0.005 s 0.005 s 20 0 0 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_cv 6.73 % 6.68 % 20 0.00% 0.00% 0.00% 0.00% 0.00% 0.00%
RUNNING: build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-AFTER Data/data/wkt/norway-MP.wkt --benchmark_repetitions=20 --benchmark_counters_tabular=true --benchmark_time_unit=s --benchmark_out=/tmp/tmp59ui0dsw
2025-02-06T17:29:26+01:00
Running Data/data/wkt/norway-MP.wkt
Run on (16 X 800.961 MHz CPU s)
CPU Caches:
L1 Data 48 KiB (x8)
L1 Instruction 32 KiB (x8)
L2 Unified 1280 KiB (x8)
L3 Unified 24576 KiB (x1)
Load Average: 1.61, 1.94, 1.73
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Benchmark Time CPU Iterations #points #polygons #polylines nb of constraints nb of sub-constraints nb of vertices
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.057 s 0.057 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.059 s 0.059 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.065 s 0.065 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.058 s 0.058 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.056 s 0.056 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.053 s 0.053 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.061 s 0.061 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.058 s 0.058 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.052 s 0.052 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.055 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.055 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.054 s 0.054 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.059 s 0.059 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.057 s 0.057 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.058 s 0.057 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.055 s 0.055 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt 0.059 s 0.059 s 13 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_mean 0.057 s 0.057 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_median 0.057 s 0.056 s 20 0 848 0 849 40.568k 40.565k
simplify file Data/data/wkt/norway-MP.wkt_stddev 0.003 s 0.003 s 20 0 0 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_cv 5.37 % 5.32 % 20 0.00% 0.00% 0.00% 0.00% 0.00% 0.00%
Comparing build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-BEFORE to build/Release/benchmark/Polyline_simplification_2/benchmark_simplify-AFTER
Benchmark Time CPU Time Old Time New CPU Old CPU New
-----------------------------------------------------------------------------------------------------------------------------------------------
simplify file Data/data/wkt/norway-MP.wkt -0.1941 -0.1942 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1269 -0.1272 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.0900 -0.0918 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1049 -0.1065 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1204 -0.1206 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1279 -0.1282 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1962 -0.1961 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1370 -0.1377 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.0951 -0.0962 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1851 -0.1852 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2720 -0.2716 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1702 -0.1717 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2700 -0.2703 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2644 -0.2634 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2861 -0.2856 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2492 -0.2488 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.2310 -0.2301 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1382 -0.1389 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1401 -0.1406 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt -0.1464 -0.1467 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_pvalue 0.0000 0.0000 U Test, Repetitions: 20 vs 20
simplify file Data/data/wkt/norway-MP.wkt_mean -0.1804 -0.1806 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_median -0.1547 -0.1549 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_stddev -0.3458 -0.3479 0 0 0 0
simplify file Data/data/wkt/norway-MP.wkt_cv -0.2018 -0.2041 0 0 0 0
OVERALL_GEOMEAN -0.1797 -0.1800 0 0 0 0
```
2025-02-06 17:44:28 +01:00
050677f002
add CMake option CGAL_with_benchmarks
2025-02-06 01:21:42 +01:00
e5001d1a50
update our CMake version 3.18...3.31
...
That will suppress the warnings about `CMP0167` (from CMake 3.30):
```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
Policy CMP0167 is not set: The FindBoost module is removed. Run "cmake
--help-policy CMP0167" for policy details. Use the cmake_policy command to
set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
11640a3946
Merge remote-tracking branch 'cgal/6.0.x-branch' in master
2024-12-04 14:13:01 +01:00
cab2412bee
add missing default for LCC
2024-11-29 21:13:11 +01:00
1690619625
CGAL: Modernize CMakeLists.txt ( #8528 )
...
## Summary of Changes
- Changed `PUBLIC` to `PRIVATE` in the `target_link_libraries()`
- ~~Link against `Boost::<COMPONENT>`~~ as we do more than just linking
and must use the `CGAL::_.._support`
- Use `target_compile_definitions()` and `add_compile_definitions()`
More to be done.
## Release Management
* Affected package(s): all
* Issue(s) solved (if any): fix one item of #4815
* License and copyright ownership: unchanged
2024-10-31 10:32:25 +01:00
fb605cdd39
remove -D that is not compatible with "older" cmake versions
2024-10-22 08:19:49 +02:00
7c4badc67c
Merge pull request #8501 from afabri/CGAL-assert-GF
...
assert() -> CGAL::assertion()
2024-10-21 19:17:21 +02:00
fb2a9eac90
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
2024-10-21 16:32:51 +02:00
96cd3e6f09
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
2024-10-17 00:25:24 +02:00
b3762ede88
Rename set_update_attributes in set_automatic_attributes_management in LCC demo
2024-10-16 08:26:18 +02:00
db8b774729
method to allow to not correct attributes when changing automatic management mode.
2024-10-15 10:21:52 +02:00
9e75ab340d
Use add_compile_definitions
2024-10-09 11:58:52 +01:00
95616154d5
More PRIVATE in LCC and Generalized_map
2024-10-09 07:19:52 +01:00
527569346e
CGAL: Modernize CMakeLists.txt
2024-10-08 17:02:41 +01:00
dd02af92a2
issue #8515 Spelling mistakes found checking `en-GB` to `en-US`
...
Spelling corrections, `en-GB` -> `en-US`
2024-10-05 11:28:29 +02:00
782e741310
CGAL: assert() -> CGAL::assertion()
2024-09-27 13:00:15 +01:00
4cf1f4b214
CONFIG options is only needed if a FindXXX.cmake exists
2024-09-04 14:48:07 +02:00
b5fc288336
update Linear_cell_complex benchmark wrt OpenMesh
2024-08-27 14:06:46 +02:00
32893b91c0
Merge pull request #8263 from lrineau/CGAL-update_minimal_cmake-GF
...
cmake_minimum_required(VERSION 3.12...3.29)
2024-06-12 10:06:12 +02:00
5b003a7808
Merge pull request #8246 from albert-github/feature/bug_spell_20240531
...
Spelling corrections
2024-06-10 18:47:22 +02:00
ee948a2041
Merge branch '5.6.x-branch'
2024-06-10 18:47:09 +02:00
3a223ebd1e
cmake_minimum_required(VERSION 3.12...3.29)
2024-06-06 20:19:44 +02:00
e4140c286f
Change type in storage with index (cmap, gmap, lcc)
2024-06-05 14:58:22 +02:00
d3e88f29b8
Use different number types for lcc with index in tests.
2024-06-05 14:44:47 +02:00
31f5aa5ad0
add missing friend
2024-06-05 13:45:08 +02:00
c0c768b2bb
Bug fix: definition of Self and Base in class Cell_attribute_with_point when using index.
2024-06-05 11:00:18 +02:00
36c8b7589d
Spelling corrections
...
Last batch (for now) of spelling corrections in doxygen and normal comments
2024-05-31 19:05:34 +02:00
92a5cc9ea0
Spelling correction
...
instanciation -> instantiation
2024-05-27 13:01:46 +02:00
180dbaeb40
fix dependency updates
2024-04-11 09:51:34 +02:00
4db6bc6d16
Merge pull request #6967 from gdamiand/gsoc2022-EBVs-Mostafa-ashraf19
...
GSoC'22: New CGAL's design to handle basic viewers
2024-04-10 18:04:25 +02:00
708711e7a7
Merge pull request #8018 from janetournois/PMP-add_bbox_to_face_graph-jtournois
...
New function `PMP::add_bbox(face_graph)` that adds bbox to face graph
2024-04-05 14:25:17 +02:00
9a0b8eb824
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19
2024-03-26 16:25:29 +01:00
a42d56fc67
Add several #include
2024-03-14 10:09:07 +01:00
a02ce9ea21
fix dependencies by removing Random_numbers where it's not needed anymore
2024-03-07 09:36:59 +01:00
910945eb5f
undo dependency changes + always use core if not disabled
2024-02-27 16:19:28 +01:00
3b30756cd3
do not depend on CGAL_Core
2024-02-27 14:46:18 +01:00
e4558a4d4b
Merge branch 'master' into CORE-boost_mp_number-GF
2024-02-23 17:04:37 +01:00
7b483d4128
warning in draw lcc
2023-12-27 17:57:00 +01:00
bd04b2a68d
Remove space in doc
2023-12-06 17:01:34 +01:00
3d8037d7f6
doc draw lcc
2023-12-05 15:11:49 +01:00
f70a2d30cd
draw lcc
2023-12-01 09:06:54 +01:00
310ad8e40c
remove old file
2023-11-30 16:40:12 +01:00
f8a487d9ef
update dependencies
2023-11-29 18:12:09 +01:00
2c77ba397c
draw face graph with path
2023-11-29 15:50:26 +01:00
0655006622
Merge with master: now viewers use Qt6
2023-11-29 14:36:38 +01:00
51627e3505
Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF
...
# Conflicts:
# GraphicsView/demo/Bounding_volumes/CMakeLists.txt
2023-11-01 20:59:44 +01:00
126b9360c9
Remove _qt from Basic viewer name
2023-10-24 08:27:18 +02:00
761fde02be
add_in_graphics_scene -> add_to_graphics_scene; plus remove template parameter NumberType
2023-10-23 01:52:38 +02:00
Laurent Rineau
Sébastien Loriot
Guillaume Damiand
Andreas Fabri
albert-github
Jane Tournois