Skip to content

Commit 3e44b8d

Browse files
authored
[CI] Fix scene tests by ignoring Cuda scenes from benchmarks (sofa-framework#6014)
Ignore cuda based scene tests and rename the generic funciton to create scene
1 parent 5b97c11 commit 3e44b8d

11 files changed

+18
-10
lines changed

examples/.scene-tests

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,11 @@ ignore "Benchmark/TopologicalChanges/FixedPlaneConstraint_RemovingMeshTest.scn"
4242
ignore "Component/Constraint/Lagrangian/Contact_ImprovedJacobi.scn"
4343

4444
timeout "Component/AnimationLoop/FreeMotionAnimationLoop.scn" "180"
45+
46+
47+
#SofaCuda not available
48+
ignore "Benchmark/Performance/Bar16-fem-implicit-CudaVec3d.py"
49+
ignore "Benchmark/Performance/Bar16-fem-implicit-CudaVec3f.py"
50+
ignore "Benchmark/Performance/Bar16-spring-rk4-CudaVec3d.py"
51+
ignore "Benchmark/Performance/Bar16-spring-rk4-CudaVec3f.py"
52+

examples/Benchmark/Performance/Bar16-fem-implicit-CudaVec3d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
def createScene(root_node):
55
root_node.addObject('RequiredPlugin', name='SofaCUDA')
6-
bar16_fem_implicit.createScene(root_node, "CudaVec3d")
6+
bar16_fem_implicit.internalCreateScene(root_node, "CudaVec3d")

examples/Benchmark/Performance/Bar16-fem-implicit-CudaVec3f.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
def createScene(root_node):
55
root_node.addObject('RequiredPlugin', name='SofaCUDA')
6-
bar16_fem_implicit.createScene(root_node, "CudaVec3f")
6+
bar16_fem_implicit.internalCreateScene(root_node, "CudaVec3f")

examples/Benchmark/Performance/Bar16-fem-implicit-Vec3d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
bar16_fem_implicit = importlib.import_module("Bar16-fem-implicit")
33

44
def createScene(root_node):
5-
bar16_fem_implicit.createScene(root_node, "Vec3d")
5+
bar16_fem_implicit.internalCreateScene(root_node, "Vec3d")

examples/Benchmark/Performance/Bar16-fem-implicit-Vec3f.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
bar16_fem_implicit = importlib.import_module("Bar16-fem-implicit")
33

44
def createScene(root_node):
5-
bar16_fem_implicit.createScene(root_node, "Vec3f")
5+
bar16_fem_implicit.internalCreateScene(root_node, "Vec3f")

examples/Benchmark/Performance/Bar16-fem-implicit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
g_size = 10;
66

7-
def createScene(root_node, template):
7+
def internalCreateScene(root_node, template):
88

99
size = int(os.getenv('s', g_size)) # read the value for size from the env, fallback to g_size if the env.var not set
1010

examples/Benchmark/Performance/Bar16-spring-rk4-CudaVec3d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
def createScene(root_node):
55
root_node.addObject('RequiredPlugin', name='SofaCUDA')
6-
Bar16_spring_rk4.createScene(root_node, "CudaVec3d")
6+
Bar16_spring_rk4.internalCreateScene(root_node, "CudaVec3d")

examples/Benchmark/Performance/Bar16-spring-rk4-CudaVec3f.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
def createScene(root_node):
55
root_node.addObject('RequiredPlugin', name='SofaCUDA')
6-
Bar16_spring_rk4.createScene(root_node, "CudaVec3f")
6+
Bar16_spring_rk4.internalCreateScene(root_node, "CudaVec3f")

examples/Benchmark/Performance/Bar16-spring-rk4-Vec3d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Bar16_spring_rk4 = importlib.import_module("Bar16-spring-rk4")
33

44
def createScene(root_node):
5-
Bar16_spring_rk4.createScene(root_node, "Vec3d")
5+
Bar16_spring_rk4.internalCreateScene(root_node, "Vec3d")

examples/Benchmark/Performance/Bar16-spring-rk4-Vec3f.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Bar16_spring_rk4 = importlib.import_module("Bar16-spring-rk4")
33

44
def createScene(root_node):
5-
Bar16_spring_rk4.createScene(root_node, "Vec3f")
5+
Bar16_spring_rk4.internalCreateScene(root_node, "Vec3f")

0 commit comments

Comments
 (0)