mirror of https://github.com/CGAL/cgal
Add two benchmarks for parallelism of implicit/image data
This commit is contained in:
Mael Rouxel-Labbé
parent
35cc806d59
commit
a23f15df28
|
|
@ -6,15 +6,31 @@ project( Isosurfacing_3_benchmark )
|
|||
|
||||
find_package(CGAL REQUIRED)
|
||||
|
||||
create_single_source_cgal_program( "benchmark.cpp" )
|
||||
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
|
||||
include(CGAL_Eigen3_support)
|
||||
|
||||
find_package(TBB)
|
||||
include(CGAL_TBB_support)
|
||||
if(TARGET CGAL::TBB_support)
|
||||
target_link_libraries(benchmark PUBLIC CGAL::TBB_support)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(benchmark PUBLIC ${SCENARIO})
|
||||
target_compile_definitions(benchmark PUBLIC ${KERNEL})
|
||||
target_compile_definitions(benchmark PUBLIC ${ALGO})
|
||||
target_compile_definitions(benchmark PUBLIC ${TAG})
|
||||
if(TARGET CGAL::Eigen3_support)
|
||||
create_single_source_cgal_program("benchmark.cpp" )
|
||||
create_single_source_cgal_program("contouring_seq_vs_parallel_implicit.cpp" )
|
||||
create_single_source_cgal_program("contouring_seq_vs_parallel_image.cpp" )
|
||||
|
||||
target_compile_definitions(benchmark PUBLIC ${SCENARIO})
|
||||
target_compile_definitions(benchmark PUBLIC ${KERNEL})
|
||||
target_compile_definitions(benchmark PUBLIC ${ALGO})
|
||||
target_compile_definitions(benchmark PUBLIC ${TAG})
|
||||
|
||||
target_link_libraries(benchmark PRIVATE CGAL::Eigen3_support)
|
||||
target_link_libraries(contouring_seq_vs_parallel_implicit PRIVATE CGAL::Eigen3_support)
|
||||
target_link_libraries(contouring_seq_vs_parallel_image PRIVATE CGAL::Eigen3_support)
|
||||
|
||||
if(TARGET CGAL::TBB_support)
|
||||
target_link_libraries(benchmark PUBLIC CGAL::TBB_support)
|
||||
target_link_libraries(contouring_seq_vs_parallel_implicit PUBLIC CGAL::TBB_support)
|
||||
target_link_libraries(contouring_seq_vs_parallel_image PUBLIC CGAL::TBB_support)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "NOTICE: Some benchmarks use Eigen, and will not be compiled.")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,163 @@
|
|||
#include <CGAL/Simple_cartesian.h>
|
||||
|
||||
#include <CGAL/Isosurfacing_3/Cartesian_grid_3.h>
|
||||
#include <CGAL/Isosurfacing_3/dual_contouring_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Dual_contouring_domain_3.h>
|
||||
#include <CGAL/Isosurfacing_3/marching_cubes_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Marching_cubes_domain_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Value_function_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Finite_difference_gradient_3.h>
|
||||
#include <CGAL/Isosurfacing_3/internal/implicit_shapes_helper.h>
|
||||
|
||||
#include <CGAL/Real_timer.h>
|
||||
|
||||
#include <CGAL/Isosurfacing_3/IO/Image_3.h>
|
||||
#include <CGAL/IO/polygon_soup_io.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
using Kernel = CGAL::Simple_cartesian<double>;
|
||||
using FT = typename Kernel::FT;
|
||||
using Point = typename Kernel::Point_3;
|
||||
using Vector = typename Kernel::Vector_3;
|
||||
|
||||
using Grid = CGAL::Isosurfacing::Cartesian_grid_3<Kernel>;
|
||||
using Values = CGAL::Isosurfacing::Interpolated_discrete_values_3<Grid>;
|
||||
using Gradients = CGAL::Isosurfacing::Finite_difference_gradient_3<Kernel>;
|
||||
|
||||
using Point_range = std::vector<Point>;
|
||||
using Polygon_range = std::vector<std::vector<std::size_t> >;
|
||||
|
||||
namespace IS = CGAL::Isosurfacing;
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
const std::string fname = (argc > 1) ? argv[1] : CGAL::data_file_path("images/skull_2.9.inr");
|
||||
const FT isovalue = (argc > 2) ? std::stod(argv[2]) : - 2.9;
|
||||
|
||||
// load volumetric image from a file
|
||||
CGAL::Image_3 image;
|
||||
if(!image.read(fname))
|
||||
{
|
||||
std::cerr << "Error: Cannot read image file " << fname << std::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
// convert image to a Cartesian grid
|
||||
Grid grid;
|
||||
Values values { grid };
|
||||
if(!IS::IO::read_Image_3(image, grid, values))
|
||||
{
|
||||
std::cerr << "Error: Cannot convert image to Cartesian grid" << std::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
for (std::size_t i=0; i<grid.xdim(); ++i)
|
||||
for (std::size_t j=0; j<grid.ydim(); ++j)
|
||||
for (std::size_t k=0; k<grid.zdim(); ++k)
|
||||
values(i, j, k) = - values(i, j, k); // inside out
|
||||
|
||||
std::cout << "Bbox: " << grid.bbox() << std::endl;
|
||||
std::cout << "Cell dimensions: " << grid.spacing()[0] << " " << grid.spacing()[1] << " " << grid.spacing()[2] << std::endl;
|
||||
std::cout << "Cell #: " << grid.xdim() << ", " << grid.ydim() << ", " << grid.zdim() << std::endl;
|
||||
|
||||
Gradients gradients { values };
|
||||
|
||||
const bool triangulate_faces = false;
|
||||
|
||||
// DC sequential
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Dual_contouring_domain_3<Grid, Values, Gradients>;
|
||||
Domain domain { grid, values, gradients };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Dual Contouring (Sequential)" << std::endl;
|
||||
IS::dual_contouring<CGAL::Sequential_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("dual_contouring_image_sequential.off", points, triangles);
|
||||
}
|
||||
|
||||
// DC parallel
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Dual_contouring_domain_3<Grid, Values, Gradients>;
|
||||
Domain domain { grid, values, gradients };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Dual Contouring (Parallel)" << std::endl;
|
||||
IS::dual_contouring<CGAL::Parallel_if_available_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("dual_contouring_image_parallel.off", points, triangles);
|
||||
}
|
||||
|
||||
// MC Sequential
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Marching_cubes_domain_3<Grid, Values>;
|
||||
Domain domain { grid, values };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Marching Cubes (Sequential)" << std::endl;
|
||||
IS::marching_cubes<CGAL::Sequential_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("marching_cubes_image_sequential.off", points, triangles);
|
||||
}
|
||||
|
||||
// MC parallel
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Marching_cubes_domain_3<Grid, Values>;
|
||||
Domain domain { grid, values };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Marching Cubes (Parallel)" << std::endl;
|
||||
IS::marching_cubes<CGAL::Parallel_if_available_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("marching_cubes_image_parallel.off", points, triangles);
|
||||
}
|
||||
|
||||
std::cout << "Done" << std::endl;
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
|
@ -0,0 +1,156 @@
|
|||
#include <CGAL/Simple_cartesian.h>
|
||||
|
||||
#include <CGAL/Isosurfacing_3/Cartesian_grid_3.h>
|
||||
#include <CGAL/Isosurfacing_3/dual_contouring_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Dual_contouring_domain_3.h>
|
||||
#include <CGAL/Isosurfacing_3/marching_cubes_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Marching_cubes_domain_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Value_function_3.h>
|
||||
#include <CGAL/Isosurfacing_3/Finite_difference_gradient_3.h>
|
||||
#include <CGAL/Isosurfacing_3/internal/implicit_shapes_helper.h>
|
||||
|
||||
#include <CGAL/Real_timer.h>
|
||||
|
||||
#include <CGAL/IO/polygon_soup_io.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
using Kernel = CGAL::Simple_cartesian<double>;
|
||||
using FT = typename Kernel::FT;
|
||||
using Point = typename Kernel::Point_3;
|
||||
using Vector = typename Kernel::Vector_3;
|
||||
|
||||
using Grid = CGAL::Isosurfacing::Cartesian_grid_3<Kernel>;
|
||||
using Values = CGAL::Isosurfacing::Value_function_3<Grid>;
|
||||
using Gradients = CGAL::Isosurfacing::Finite_difference_gradient_3<Kernel>;
|
||||
|
||||
using Point_range = std::vector<Point>;
|
||||
using Polygon_range = std::vector<std::vector<std::size_t> >;
|
||||
|
||||
namespace IS = CGAL::Isosurfacing;
|
||||
|
||||
auto implicit_function = [](const Point& q) -> FT
|
||||
{
|
||||
auto cyl = [](const Point& q) { return IS::Shapes::infinite_cylinder<Kernel>(Point(0,0,0), Vector(0,0,1), 0.5, q); };
|
||||
auto cube = [](const Point& q) { return IS::Shapes::box<Kernel>(Point(-0.5,-0.5,-0.5), Point(0.5,0.5,0.5), q); };
|
||||
auto cyl_and_cube = [&](const Point& q) { return IS::Shapes::shape_union<Kernel>(cyl, cube, q); };
|
||||
|
||||
auto sphere = [](const Point& q) { return IS::Shapes::sphere<Kernel>(Point(0,0,0.5), 0.75, q); };
|
||||
return IS::Shapes::shape_difference<Kernel>(cyl_and_cube, sphere, q);
|
||||
};
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
const FT isovalue = (argc > 1) ? std::stod(argv[1]) : 0.;
|
||||
std::cout << "Isovalue: " << isovalue << std::endl;
|
||||
|
||||
// create bounding box and grid
|
||||
const CGAL::Bbox_3 bbox = {-2., -2., -2., 2., 2., 2.};
|
||||
Grid grid { bbox, 150, 150, 150 };
|
||||
|
||||
std::cout << "Bbox: " << grid.bbox() << std::endl;
|
||||
std::cout << "Cell dimensions: " << grid.spacing()[0] << " " << grid.spacing()[1] << " " << grid.spacing()[2] << std::endl;
|
||||
std::cout << "Cell #: " << grid.xdim() << ", " << grid.ydim() << ", " << grid.zdim() << std::endl;
|
||||
|
||||
// fill up values and gradients
|
||||
Values values { implicit_function, grid };
|
||||
Gradients gradients { values };
|
||||
|
||||
const bool triangulate_faces = false;
|
||||
|
||||
// DC parallel
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Dual_contouring_domain_3<Grid, Values, Gradients>;
|
||||
Domain domain { grid, values, gradients };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Dual Contouring (Parallel)" << std::endl;
|
||||
IS::dual_contouring<CGAL::Parallel_if_available_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("dual_contouring_implicit_parallel.off", points, triangles);
|
||||
}
|
||||
|
||||
// DC sequential
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Dual_contouring_domain_3<Grid, Values, Gradients>;
|
||||
Domain domain { grid, values, gradients };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Dual Contouring (Sequential)" << std::endl;
|
||||
IS::dual_contouring<CGAL::Sequential_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("dual_contouring_implicit_sequential.off", points, triangles);
|
||||
}
|
||||
|
||||
// MC Sequential
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Marching_cubes_domain_3<Grid, Values>;
|
||||
Domain domain { grid, values };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Marching Cubes (Sequential)" << std::endl;
|
||||
IS::marching_cubes<CGAL::Sequential_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("marching_cubes_implicit_sequential.off", points, triangles);
|
||||
}
|
||||
|
||||
// MC parallel
|
||||
{
|
||||
using Domain = CGAL::Isosurfacing::Marching_cubes_domain_3<Grid, Values>;
|
||||
Domain domain { grid, values };
|
||||
|
||||
CGAL::Real_timer timer;
|
||||
timer.start();
|
||||
|
||||
Point_range points;
|
||||
Polygon_range triangles;
|
||||
|
||||
std::cout << "--- Marching Cubes (Parallel)" << std::endl;
|
||||
IS::marching_cubes<CGAL::Parallel_if_available_tag>(
|
||||
domain, isovalue, points, triangles, CGAL::parameters::do_not_triangulate_faces(!triangulate_faces));
|
||||
|
||||
timer.stop();
|
||||
|
||||
std::cout << "Output #vertices: " << points.size() << std::endl;
|
||||
std::cout << "Output #triangles: " << triangles.size() << std::endl;
|
||||
std::cout << "Elapsed time: " << timer.time() << " seconds" << std::endl;
|
||||
CGAL::IO::write_polygon_soup("marching_cubes_implicit_parallel.off", points, triangles);
|
||||
}
|
||||
|
||||
std::cout << "Done" << std::endl;
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
Loading…
Reference in New Issue