-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #167 from cgogn/develop
Develop
- Loading branch information
Showing
583 changed files
with
81,284 additions
and
4,198 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| add_subdirectory(multithreading) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| cmake_minimum_required(VERSION 3.0 FATAL_ERROR) | ||
|
|
||
| project(bench_multithreading | ||
| LANGUAGES CXX | ||
| ) | ||
|
|
||
| set(CGOGN_TEST_MESHES_PATH "${CMAKE_SOURCE_DIR}/data/meshes/") | ||
| add_definitions("-DCGOGN_TEST_MESHES_PATH=${CGOGN_TEST_MESHES_PATH}") | ||
|
|
||
| add_executable(${PROJECT_NAME} bench_multithreading.cpp) | ||
| target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/thirdparty/google-benchmark/include) | ||
| target_link_libraries(${PROJECT_NAME} cgogn_core cgogn_io cgogn_geometry benchmark) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,244 @@ | ||
| /******************************************************************************* | ||
| * CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps * | ||
| * Copyright (C) 2015, IGG Group, ICube, University of Strasbourg, France * | ||
| * * | ||
| * This library is free software; you can redistribute it and/or modify it * | ||
| * under the terms of the GNU Lesser General Public License as published by the * | ||
| * Free Software Foundation; either version 2.1 of the License, or (at your * | ||
| * option) any later version. * | ||
| * * | ||
| * This library is distributed in the hope that it will be useful, but WITHOUT * | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * | ||
| * for more details. * | ||
| * * | ||
| * You should have received a copy of the GNU Lesser General Public License * | ||
| * along with this library; if not, write to the Free Software Foundation, * | ||
| * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * | ||
| * * | ||
| * Web site: http://cgogn.unistra.fr/ * | ||
| * Contact information: [email protected] * | ||
| * * | ||
| *******************************************************************************/ | ||
|
|
||
| #include <chrono> | ||
| #include <vector> | ||
|
|
||
| #include <core/cmap/cmap2.h> | ||
| #include <io/map_import.h> | ||
| #include <geometry/algos/normal.h> | ||
|
|
||
| #include <benchmark/benchmark.h> | ||
|
|
||
| #define DEFAULT_MESH_PATH CGOGN_STR(CGOGN_TEST_MESHES_PATH) | ||
|
|
||
| using namespace cgogn::numerics; | ||
|
|
||
|
|
||
| using Map2 = cgogn::CMap2<cgogn::DefaultMapTraits>; | ||
| Map2 bench_map; | ||
|
|
||
| using Vertex = Map2::Vertex; | ||
| const cgogn::Orbit VERTEX = Vertex::ORBIT; | ||
|
|
||
| using Face = Map2::Face; | ||
| const cgogn::Orbit FACE = Face::ORBIT; | ||
|
|
||
| const uint32 ITERATIONS = 1u; | ||
|
|
||
| //using Vec3 = Eigen::Vector3d; | ||
| using Vec3 = cgogn::geometry::Vec_T<std::array<float64,3>>; | ||
|
|
||
| template <typename T> | ||
| using VertexAttributeHandler = Map2::VertexAttributeHandler<T>; | ||
| template <typename T> | ||
| using FaceAttributeHandler = Map2::FaceAttributeHandler<T>; | ||
|
|
||
| static void BENCH_Dart_count_single_threaded(benchmark::State& state) | ||
| { | ||
| while (state.KeepRunning()) | ||
| { | ||
| unsigned nb_darts = 0u; | ||
| bench_map.foreach_dart([&nb_darts] (cgogn::Dart) { nb_darts++; }); | ||
| } | ||
| } | ||
|
|
||
| static void BENCH_Dart_count_multi_threaded(benchmark::State& state) | ||
| { | ||
| while (state.KeepRunning()) | ||
| { | ||
| uint32 nb_darts_2 = 0u; | ||
| std::vector<uint32> nb_darts_per_thread(cgogn::get_nb_threads()+2); | ||
| for (auto& n : nb_darts_per_thread) | ||
| n = 0u; | ||
| nb_darts_2 = 0u; | ||
| bench_map.parallel_foreach_dart([&nb_darts_per_thread] (cgogn::Dart, uint32 thread_index) | ||
| { | ||
| nb_darts_per_thread[thread_index]++; | ||
| }); | ||
| for (uint32 n : nb_darts_per_thread) | ||
| nb_darts_2 += n; | ||
|
|
||
| cgogn_assert(nb_darts_2 == bench_map.nb_darts()); | ||
| } | ||
| } | ||
|
|
||
| template<cgogn::TraversalStrategy STRATEGY> | ||
| static void BENCH_faces_normals_single_threaded(benchmark::State& state) | ||
| { | ||
| while(state.KeepRunning()) | ||
| { | ||
| state.PauseTiming(); | ||
| VertexAttributeHandler<Vec3> vertex_position = bench_map.get_attribute<Vec3, VERTEX>("position"); | ||
| cgogn_assert(vertex_position.is_valid()); | ||
| FaceAttributeHandler<Vec3> face_normal = bench_map.get_attribute<Vec3, FACE>("normal"); | ||
| cgogn_assert(face_normal.is_valid()); | ||
| state.ResumeTiming(); | ||
|
|
||
| bench_map.template foreach_cell<STRATEGY>([&] (Face f) | ||
| { | ||
| face_normal[f] = cgogn::geometry::face_normal<Vec3>(bench_map, f, vertex_position); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| template<cgogn::TraversalStrategy STRATEGY> | ||
| static void BENCH_faces_normals_multi_threaded(benchmark::State& state) | ||
| { | ||
| while(state.KeepRunning()) | ||
| { | ||
| state.PauseTiming(); | ||
| VertexAttributeHandler<Vec3> vertex_position = bench_map.get_attribute<Vec3, VERTEX>("position"); | ||
| cgogn_assert(vertex_position.is_valid()); | ||
| FaceAttributeHandler<Vec3> face_normal_mt = bench_map.get_attribute<Vec3, FACE>("normal_mt"); | ||
| cgogn_assert(face_normal_mt.is_valid()); | ||
| state.ResumeTiming(); | ||
|
|
||
| bench_map.template parallel_foreach_cell<STRATEGY>([&] (Face f,uint32) | ||
| { | ||
| face_normal_mt[f] = cgogn::geometry::face_normal<Vec3>(bench_map, f, vertex_position); | ||
| }); | ||
|
|
||
| { | ||
| state.PauseTiming(); | ||
|
|
||
| FaceAttributeHandler<Vec3> face_normal = bench_map.get_attribute<Vec3, FACE>("normal"); | ||
| bench_map.template foreach_cell<cgogn::TraversalStrategy::FORCE_DART_MARKING>([&] (Face f) | ||
| { | ||
| Vec3 error = face_normal[f] - face_normal_mt[f]; | ||
| if (!cgogn::almost_equal_absolute(error.squaredNorm(), 0., 1e-9 )) | ||
| { | ||
| std::cerr << __FILE__ << ":" << __LINE__ << " : there was an error during computation of normals" << std::endl; | ||
| // std::cerr << "face_normal " << face_normal[f] << std::endl; | ||
| // std::cerr << "face_normal_mt " << face_normal_mt[f] << std::endl; | ||
| } | ||
|
|
||
| }); | ||
| state.ResumeTiming(); | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
|
|
||
| template<cgogn::TraversalStrategy STRATEGY> | ||
| static void BENCH_vertices_normals_single_threaded(benchmark::State& state) | ||
| { | ||
| while(state.KeepRunning()) | ||
| { | ||
| state.PauseTiming(); | ||
| VertexAttributeHandler<Vec3> vertex_position = bench_map.get_attribute<Vec3, VERTEX>("position"); | ||
| cgogn_assert(vertex_position.is_valid()); | ||
| VertexAttributeHandler<Vec3> vartices_normal = bench_map.get_attribute<Vec3, VERTEX>("normal"); | ||
| cgogn_assert(vartices_normal.is_valid()); | ||
| state.ResumeTiming(); | ||
|
|
||
| bench_map.template foreach_cell<STRATEGY>([&] (Vertex v) | ||
| { | ||
| vartices_normal[v] = cgogn::geometry::vertex_normal<Vec3>(bench_map, v, vertex_position); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| template<cgogn::TraversalStrategy STRATEGY> | ||
| static void BENCH_vertices_normals_multi_threaded(benchmark::State& state) | ||
| { | ||
| while(state.KeepRunning()) | ||
| { | ||
| state.PauseTiming(); | ||
| VertexAttributeHandler<Vec3> vertex_position = bench_map.get_attribute<Vec3, VERTEX>("position"); | ||
| cgogn_assert(vertex_position.is_valid()); | ||
| VertexAttributeHandler<Vec3> vertices_normal_mt = bench_map.get_attribute<Vec3, VERTEX>("normal_mt"); | ||
| cgogn_assert(vertices_normal_mt.is_valid()); | ||
| state.ResumeTiming(); | ||
|
|
||
| bench_map.template parallel_foreach_cell<STRATEGY>([&] (Vertex v, uint32) | ||
| { | ||
| vertices_normal_mt[v] = cgogn::geometry::vertex_normal<Vec3>(bench_map, v, vertex_position); | ||
| }); | ||
|
|
||
| { | ||
| state.PauseTiming(); | ||
|
|
||
| VertexAttributeHandler<Vec3> vertices_normal = bench_map.get_attribute<Vec3, VERTEX>("normal"); | ||
| bench_map.template foreach_cell<cgogn::TraversalStrategy::FORCE_DART_MARKING>([&] (Vertex v) | ||
| { | ||
| Vec3 error = vertices_normal[v] - vertices_normal_mt[v]; | ||
| if (!cgogn::almost_equal_absolute(error.squaredNorm(), 0., 1e-9 )) | ||
| { | ||
| std::cerr << __FILE__ << ":" << __LINE__ << " : there was an error during computation of vertices normals" << std::endl; | ||
| // std::cerr << "vertices_normal " << vertices_normal[v] << std::endl; | ||
| // std::cerr << "vertices_normal_mt " << vertices_normal_mt[v] << std::endl; | ||
| } | ||
|
|
||
| }); | ||
| state.ResumeTiming(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| BENCHMARK(BENCH_Dart_count_single_threaded); | ||
| BENCHMARK(BENCH_Dart_count_multi_threaded)->UseRealTime(); | ||
|
|
||
| BENCHMARK_TEMPLATE(BENCH_faces_normals_single_threaded, cgogn::TraversalStrategy::FORCE_DART_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_faces_normals_multi_threaded, cgogn::TraversalStrategy::FORCE_DART_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_faces_normals_single_threaded, cgogn::TraversalStrategy::FORCE_CELL_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_faces_normals_multi_threaded, cgogn::TraversalStrategy::FORCE_CELL_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_faces_normals_single_threaded, cgogn::TraversalStrategy::FORCE_TOPO_CACHE)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_faces_normals_multi_threaded, cgogn::TraversalStrategy::FORCE_TOPO_CACHE)->UseRealTime(); | ||
|
|
||
| BENCHMARK_TEMPLATE(BENCH_vertices_normals_single_threaded, cgogn::TraversalStrategy::FORCE_DART_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_vertices_normals_multi_threaded, cgogn::TraversalStrategy::FORCE_DART_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_vertices_normals_single_threaded, cgogn::TraversalStrategy::FORCE_CELL_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_vertices_normals_multi_threaded, cgogn::TraversalStrategy::FORCE_CELL_MARKING)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_vertices_normals_single_threaded, cgogn::TraversalStrategy::FORCE_TOPO_CACHE)->UseRealTime(); | ||
| BENCHMARK_TEMPLATE(BENCH_vertices_normals_multi_threaded, cgogn::TraversalStrategy::FORCE_TOPO_CACHE)->UseRealTime(); | ||
|
|
||
|
|
||
| int main(int argc, char** argv) | ||
| { | ||
| ::benchmark::Initialize(&argc, argv); | ||
| std::string surfaceMesh; | ||
|
|
||
| if (argc < 2) | ||
| { | ||
| std::cout << "USAGE: " << argv[0] << " [filename]" << std::endl; | ||
| surfaceMesh = std::string(DEFAULT_MESH_PATH) + std::string("aneurysm3D_1.off"); | ||
| std::cout << "Using default mesh : " << surfaceMesh << std::endl; | ||
| } | ||
| else | ||
| surfaceMesh = std::string(argv[1]); | ||
|
|
||
| cgogn::io::import_surface<Vec3>(bench_map, surfaceMesh); | ||
|
|
||
| bench_map.add_attribute<Vec3, FACE>("normal"); | ||
| bench_map.add_attribute<Vec3, FACE>("normal_mt"); | ||
| bench_map.add_attribute<Vec3, VERTEX>("normal"); | ||
| bench_map.add_attribute<Vec3, VERTEX>("normal_mt"); | ||
| bench_map.enable_topo_cache<FACE>(); | ||
| bench_map.enable_topo_cache<VERTEX>(); | ||
|
|
||
| ::benchmark::RunSpecifiedBenchmarks(); | ||
| return 0; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ if(CGOGN_USE_QT) | |
| add_subdirectory(rendering) | ||
| endif(CGOGN_USE_QT) | ||
|
|
||
| add_subdirectory(multiresolution) | ||
Oops, something went wrong.