songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small fix

This commit is contained in:
Julian Stahl 2022-09-09 16:38:11 +02:00
parent 3a096512b3
commit fc14e2c87c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Isosurfacing_3/benchmark/Isosurfacing_3/benchmark.cpp
View File

@ -19,7 +19,9 @@
#include "CLI11.hpp" #include "CLI11.hpp"
#include "Timer.h" #include "Timer.h"
#ifndef M_PI
#define M_PI 3.141592653589793238462643383279502884L #define M_PI 3.141592653589793238462643383279502884L
#endif
template <class GeomTraits> template <class GeomTraits>
struct SphereValue { struct SphereValue {
@ -246,6 +248,4 @@ int main(int argc, char* argv[]) {
} }
std::cout << "internal timer: " << ms << std::endl; std::cout << "internal timer: " << ms << std::endl;
CGAL::IO::write_OFF("result.off", points, polygons);
} }

4
Isosurfacing_3/benchmark/Isosurfacing_3/benchmark_threads.py
View File

@ -1,7 +1,7 @@
from benchmark_util import * from benchmark_util import *
scenario = "SCENARIO_GRID_SPHERE" scenario = "SCENARIO_IMPLICIT_SPHERE"
kernel = "KERNEL_SIMPLE_CARTESIAN_FLOAT" kernel = "KERNEL_SIMPLE_CARTESIAN_DOUBLE"
algorithm = "ALGO_MARCHING_CUBES" algorithm = "ALGO_MARCHING_CUBES"
tag = "TAG_PARALLEL" tag = "TAG_PARALLEL"
min_threads = 1 min_threads = 1

4
Isosurfacing_3/benchmark/Isosurfacing_3/benchmark_util.py
View File

@ -29,10 +29,10 @@ def build(scenario, kernel, algorithm, tag):
def execute(n, threads, times=1): def execute(n, threads, times=1):
time = 0 time = 0
for i in range(times): for i in range(times):
process = run(["likwid", "-g", "MEM_DP", "-c", "S0:0-" + str(threads - 1), "./build/benchmark", "-N", str(n)], False) process = run(["likwid-perfctr", "-g", "MEM_DP", "-C", "S0:0-" + str(threads - 1), "./build/benchmark", "-N", str(n)], False)
for line in process.stdout.readlines(): for line in process.stdout.readlines():
print(line) print(line, end='')
m = re.search(r'internal timer:\s*(\d*)', line) m = re.search(r'internal timer:\s*(\d*)', line)
if m is not None: if m is not None:

2
Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Marching_cubes_3_internal.h
View File

@ -101,7 +101,7 @@ void mc_construct_triangles(const int i_case, const Vertices_& vertices, PointRa
points[t_id * 3 + 2] = vertices[eg2]; points[t_id * 3 + 2] = vertices[eg2];
// insert new triangle in list // insert new triangle in list
PolygonRange::value_type triangle(3); typename PolygonRange::value_type triangle(3);
triangle[0] = t_id * 3 + 2; triangle[0] = t_id * 3 + 2;
triangle[1] = t_id * 3 + 1; triangle[1] = t_id * 3 + 1;
triangle[2] = t_id * 3 + 0; triangle[2] = t_id * 3 + 0;