From 2ecdcd32568035074674da63c23e90e0531f9c5c Mon Sep 17 00:00:00 2001 From: Laurent Saboret Date: Wed, 8 Oct 2008 12:38:18 +0000 Subject: [PATCH] Added duration and memory statistics. --- .../include/CGAL/Poisson_implicit_function.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Surface_reconstruction_3/include/CGAL/Poisson_implicit_function.h b/Surface_reconstruction_3/include/CGAL/Poisson_implicit_function.h index e42a5ae73a7..9fe45d1bca7 100644 --- a/Surface_reconstruction_3/include/CGAL/Poisson_implicit_function.h +++ b/Surface_reconstruction_3/include/CGAL/Poisson_implicit_function.h @@ -653,6 +653,12 @@ public: long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576))); CGAL_TRACE(" Create matrix\n"); + CGAL_TRACE(" %ld Mb allocated, largest free memory block=%ld Mb, #blocks over 100 Mb=%ld\n", + long(CGAL::Memory_sizer().virtual_size())>>20, + long(taucs_available_memory_size()/1048576.0), + long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576))); + CGAL_TRACE(" Create matrix...\n"); + // get #variables unsigned int nb_variables = m_dt.index_unconstrained_vertices(); @@ -682,7 +688,8 @@ public: } *duration_assembly = (clock() - time_init)/CLOCKS_PER_SEC; - + CGAL_TRACE(" Create matrix: done (%.2lf s)\n", *duration_assembly); + /* time_init = clock(); if(!solver.solve_conjugate_gradient(B,X,10000,1e-15)) @@ -694,13 +701,14 @@ public: long(CGAL::Memory_sizer().virtual_size())>>20, long(taucs_available_memory_size()/1048576.0), long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576))); - CGAL_TRACE(" Choleschy factorization\n"); + CGAL_TRACE(" Choleschy factorization...\n"); // Choleschy factorization M = L L^T time_init = clock(); if(!solver.factorize_ooc()) return false; *duration_factorization = (clock() - time_init)/CLOCKS_PER_SEC; + CGAL_TRACE(" Choleschy factorization: done (%.2lf s)\n", *duration_factorization); // Print peak memory (Windows only) long max_memory = CGAL::Peak_memory_sizer().peak_virtual_size(); @@ -711,13 +719,14 @@ public: long(CGAL::Memory_sizer().virtual_size())>>20, long(taucs_available_memory_size()/1048576.0), long(CGAL::Peak_memory_sizer().count_free_memory_blocks(100*1048576))); - CGAL_TRACE(" Direct solve by forward and backward substitution\n"); + CGAL_TRACE(" Direct solve...\n"); // Direct solve by forward and backward substitution time_init = clock(); if(!solver.solve_ooc(B,X)) return false; *duration_solve = (clock() - time_init)/CLOCKS_PER_SEC; + CGAL_TRACE(" Direct solve: done (%.2lf s)\n", *duration_solve); /* // Choleschy factorization M = L L^T @@ -733,6 +742,8 @@ public: *duration_solve = (clock() - time_init)/CLOCKS_PER_SEC; */ + CGAL_TRACE(" Choleschy factorization + solve: done (%.2lf s)\n", *duration_factorization + *duration_solve); + // set values to vertices unsigned int index = 0; for(v = m_dt.finite_vertices_begin();