Skip to content

[Lifecycle] Fix removed headers/classes for v26.06 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredroy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Lifecycle] Fix removed headers/classes for v26.06 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...enchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/HexahedronFEMForceField_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <sofa/simulation/Simulation.h>
#include <sofa/simpleapi/SimpleApi.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/DAGNode.h>

/**
* Benchmark of HexahedronFEMForceField::buildStiffnessMatrix
Expand All @@ -20,7 +19,7 @@
static void BM_HexahedronFEMForceField_buildStiffnessMatrix(benchmark::State& state)
{
const auto multiplier = state.range(0);
const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>();
const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::Node>();
sofa::simpleapi::createObject(root, "DefaultAnimationLoop");

sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
Expand Down
5 changes: 2 additions & 3 deletions ...nchmarks/Sofa.Component.SolidMechanics.FEM.Elastic/TetrahedronFEMForceField_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#include <benchmark/benchmark.h>
#include <benchmark/benchmark.h>
#include <sofa/config.h>
#include <sofa/core/behavior/BaseLocalForceFieldMatrix.h>
#include <sofa/core/behavior/ForceField.h>
#include <sofa/simulation/Simulation.h>
#include <sofa/simpleapi/SimpleApi.h>
#include <sofa/simulation/Node.h>
#include <sofa/simulation/graph/DAGNode.h>

/**
* Benchmark of TetrahedronFEMForceField::buildStiffnessMatrix
Expand All @@ -20,7 +19,7 @@
static void BM_TetrahedronFEMForceField_buildStiffnessMatrix(benchmark::State& state)
{
const auto multiplier = state.range(0);
const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::graph::DAGNode>();
const sofa::simulation::NodeSPtr root = sofa::core::objectmodel::New<sofa::simulation::Node>();
sofa::simpleapi::createObject(root, "DefaultAnimationLoop");

sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
Expand Down
6 changes: 3 additions & 3 deletions src/benchmarks/Sofa.LinearAlgebra/SparseMatrixProduct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <iostream>
#include <iostream>
#include <benchmark/benchmark.h>

#include <sofa/linearalgebra/SparseMatrixProduct.inl>
#include <sofa/simulation/BaseSimulationExporter.h>
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/MainTaskSchedulerRegistry.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/MainTaskSchedulerRegistry.h>
#include <sofa/simulation/ParallelSparseMatrixProduct.h>
#include <utils/SparseMatrix.h>

Expand Down
2 changes: 1 addition & 1 deletion src/benchmarks/SofaCore/NarrowPhaseDetection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "NarrowPhaseDetection.h"

#include <sofa/component/collision/geometry/PointModel.h>
#include <sofa/component/collision/geometry/PointCollisionModel.h>
#include <benchmark/benchmark.h>

using sofa::core::objectmodel::New;
Expand Down
8 changes: 4 additions & 4 deletions src/benchmarks/SofaSimulationCore/TaskScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <benchmark/benchmark.h>
#include <sofa/simulation/DefaultTaskScheduler.h>
#include <sofa/simulation/CpuTask.h>
#include <sofa/simulation/MainTaskSchedulerFactory.h>
#include <sofa/simulation/ParallelForEach.h>
#include <sofa/simulation/task/DefaultTaskScheduler.h>
#include <sofa/simulation/task/CpuTask.h>
#include <sofa/simulation/task/MainTaskSchedulerFactory.h>
#include <sofa/simulation/task/ParallelForEach.h>
#include <sofa/type/Mat.h>
#include <sofa/type/vector_T.h>
#include <utils/RandomValuePool.h>
Expand Down
Loading