From 88c3238cab79badbbb6291e0faf6e10901bb95de Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 8 Apr 2020 14:53:47 +0300 Subject: [PATCH] bos #180906 [CEA] BLSURFPLUGIN multithread test regression --- tests/multithread.py | 155 +++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 78 deletions(-) diff --git a/tests/multithread.py b/tests/multithread.py index 165d6fd..f4d6238 100644 --- a/tests/multithread.py +++ b/tests/multithread.py @@ -27,83 +27,82 @@ import multiprocessing salome.salome_init() cpu_count = multiprocessing.cpu_count() -divider = min(4, cpu_count)/2.3 - -print ("Running test on workstation with %d available cores" % cpu_count) - -### -### GEOM component -### - -import GEOM -from salome.geom import geomBuilder -import math -import SALOMEDS - - -geompy = geomBuilder.New() - -O = geompy.MakeVertex(0, 0, 0) -OX = geompy.MakeVectorDXDYDZ(1, 0, 0) -OY = geompy.MakeVectorDXDYDZ(0, 1, 0) -OZ = geompy.MakeVectorDXDYDZ(0, 0, 1) -flight_solid_brep_1 = geompy.ImportBREP(os.path.join(os.getenv("BLSURFPLUGIN_ROOT_DIR"),"share/salome/resources/blsurfplugin/flight_solid.brep")) -geompy.addToStudy( O, 'O' ) -geompy.addToStudy( OX, 'OX' ) -geompy.addToStudy( OY, 'OY' ) -geompy.addToStudy( OZ, 'OZ' ) -geompy.addToStudy( flight_solid_brep_1, 'flight_solid.brep_1' ) - -### -### SMESH component -### - -import SMESH, SALOMEDS -from salome.smesh import smeshBuilder - -smesh = smeshBuilder.New() - -Mesh_1 = smesh.Mesh(flight_solid_brep_1) -MG_CADSurf = Mesh_1.Triangle(algo=smeshBuilder.MG_CADSurf) -MG_CADSurf_Parameters_1 = MG_CADSurf.Parameters() -MG_CADSurf_Parameters_1.SetPhySize( 1 ) -MG_CADSurf_Parameters_1.SetMaxSize( 1 ) -MG_CADSurf_Parameters_1.SetGradation( 1.05 ) -MG_CADSurf_Parameters_1.SetAngleMesh( 1 ) -MG_CADSurf_Parameters_1.SetChordalError( 2.40018 ) -# 4 procs are used by default -# => No need to set an option - -time0 = time.time() -isDone = Mesh_1.Compute() -time1 = time.time() - -time_multithread = time1-time0 - -print ("Time in multi thread (4 procs): %.3f s"%(time_multithread)) - -Mesh_2 = smesh.Mesh(flight_solid_brep_1) -MG_CADSurf = Mesh_2.Triangle(algo=smeshBuilder.MG_CADSurf) -MG_CADSurf_Parameters_2 = MG_CADSurf.Parameters() -MG_CADSurf_Parameters_2.SetPhySize( 1 ) -MG_CADSurf_Parameters_2.SetMaxSize( 1 ) -MG_CADSurf_Parameters_2.SetGradation( 1.05 ) -MG_CADSurf_Parameters_2.SetAngleMesh( 1 ) -MG_CADSurf_Parameters_2.SetChordalError( 2.40018 ) -# Use only one thread -MG_CADSurf_Parameters_2.SetMaxNumberOfThreads( 1 ) - -time2 = time.time() -isDone = Mesh_2.Compute() -time3 = time.time() - -time_singlethread = time3-time2 -print ("Time in single thread (1 proc): %.3f s"%(time_singlethread)) - -if cpu_count == 1: - print ("Warning: cannot validate test - only 1 cpu core is available") -else: +divider = 1 + (min(cpu_count, 4)-1)*0.4 + +if cpu_count > 2: + print ("Running test on workstation with %d available cores" % cpu_count) + + ### + ### GEOM component + ### + + import GEOM + from salome.geom import geomBuilder + import math + import SALOMEDS + + geompy = geomBuilder.New() + + O = geompy.MakeVertex(0, 0, 0) + OX = geompy.MakeVectorDXDYDZ(1, 0, 0) + OY = geompy.MakeVectorDXDYDZ(0, 1, 0) + OZ = geompy.MakeVectorDXDYDZ(0, 0, 1) + flight_solid_brep_1 = geompy.ImportBREP(os.path.join(os.getenv("BLSURFPLUGIN_ROOT_DIR"),"share/salome/resources/blsurfplugin/flight_solid.brep")) + geompy.addToStudy( O, 'O' ) + geompy.addToStudy( OX, 'OX' ) + geompy.addToStudy( OY, 'OY' ) + geompy.addToStudy( OZ, 'OZ' ) + geompy.addToStudy( flight_solid_brep_1, 'flight_solid.brep_1' ) + + ### + ### SMESH component + ### + + import SMESH, SALOMEDS + from salome.smesh import smeshBuilder + + smesh = smeshBuilder.New() + + Mesh_1 = smesh.Mesh(flight_solid_brep_1) + MG_CADSurf = Mesh_1.Triangle(algo=smeshBuilder.MG_CADSurf) + MG_CADSurf_Parameters_1 = MG_CADSurf.Parameters() + MG_CADSurf_Parameters_1.SetPhySize( 1 ) + MG_CADSurf_Parameters_1.SetMaxSize( 1 ) + MG_CADSurf_Parameters_1.SetGradation( 1.05 ) + MG_CADSurf_Parameters_1.SetAngleMesh( 1 ) + MG_CADSurf_Parameters_1.SetChordalError( 2.40018 ) + # 4 procs are used by default + # => No need to set an option + + time0 = time.time() + isDone = Mesh_1.Compute() + time1 = time.time() + + time_multithread = time1-time0 + + print ("Time in multi thread (%d procs): %.3f s"%(cpu_count, time_multithread)) + + Mesh_2 = smesh.Mesh(flight_solid_brep_1) + MG_CADSurf = Mesh_2.Triangle(algo=smeshBuilder.MG_CADSurf) + MG_CADSurf_Parameters_2 = MG_CADSurf.Parameters() + MG_CADSurf_Parameters_2.SetPhySize( 1 ) + MG_CADSurf_Parameters_2.SetMaxSize( 1 ) + MG_CADSurf_Parameters_2.SetGradation( 1.05 ) + MG_CADSurf_Parameters_2.SetAngleMesh( 1 ) + MG_CADSurf_Parameters_2.SetChordalError( 2.40018 ) + # Use only one thread + MG_CADSurf_Parameters_2.SetMaxNumberOfThreads( 1 ) + + time2 = time.time() + isDone = Mesh_2.Compute() + time3 = time.time() + + time_singlethread = time3-time2 + print ("Time in single thread (1 proc): %.3f s"%(time_singlethread)) + assert time_multithread < time_singlethread/divider -if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser() + if salome.sg.hasDesktop(): + salome.sg.updateObjBrowser() +else: + print ("Warning: multithread test is disabled for %d cpu core(s)" % cpu_count) -- 2.39.2