Skip to content

Commit 2fc0c76

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1843 from arcaneframework/dev/gg-refactor-allcelltoallenvcell
Refactor 'AllCellToAllEnvCell'
2 parents 2be15c0 + 69fd73f commit 2fc0c76

12 files changed

+323
-198
lines changed

‎arcane/src/arcane/core/materials/MaterialsCoreGlobal.h

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ namespace Arcane::Materials
4747
/*---------------------------------------------------------------------------*/
4848
/*---------------------------------------------------------------------------*/
4949

50+
class AllCellToAllEnvCellContainer;
5051
class AllEnvCellVectorView;
5152
class ComponentCell;
5253
class IMeshBlock;

‎arcane/src/arcane/core/materials/internal/IMeshMaterialMngInternal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class ARCANE_CORE_EXPORT IMeshMaterialMngInternal
8888
* destinée à être utilisée dans un RUNCOMMAND_ENUMERATE_CELL_ALLENVCELL
8989
* en conjonction de la macro ENUMERATE_CELL_ALLENVCELL
9090
*/
91-
virtual AllCellToAllEnvCell* getAllCellToAllEnvCell() const = 0;
91+
virtual AllCellToAllEnvCellContainer* getAllCellToAllEnvCellContainer() const = 0;
9292

9393
/*!
9494
* \brief Construit la table de "connectivité" CellLocalId -> AllEnvCell

‎arcane/src/arcane/materials/AllCellToAllEnvCellConverter.cc

+140-73
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@
1313

1414
#include "arcane/materials/AllCellToAllEnvCellConverter.h"
1515

16+
#include "arcane/utils/NumArray.h"
17+
1618
#include "arcane/core/IItemFamily.h"
1719
#include "arcane/core/ItemEnumerator.h"
1820
#include "arcane/core/ItemGroup.h"
1921
#include "arcane/core/materials/internal/IMeshMaterialMngInternal.h"
2022

23+
#include "arcane/materials/internal/AllCellToAllEnvCellContainer.h"
24+
2125
#include "arcane/accelerator/Reduce.h"
2226
#include "arcane/accelerator/RunCommandEnumerate.h"
2327
#include "arcane/accelerator/NumArrayViews.h"
@@ -30,24 +34,52 @@
3034
namespace Arcane::Materials
3135
{
3236

33-
class AllCellToAllEnvCell::Impl
37+
/*---------------------------------------------------------------------------*/
38+
/*---------------------------------------------------------------------------*/
39+
40+
class AllCellToAllEnvCellContainer::Impl
3441
{
3542
public:
3643

37-
static Int32 _computeMaxNbEnvPerCell(IMeshMaterialMng* material_mng);
38-
static void _updateValues(IMeshMaterialMng* material_mng,
39-
ComponentItemLocalId* mem_pool,
40-
Span<ComponentItemLocalId>* allcell_allenvcell,
41-
Int32 max_nb_env);
42-
static void _initialize(AllCellToAllEnvCell* instance);
44+
explicit Impl(IMeshMaterialMng* mm)
45+
: m_material_mng(mm)
46+
{
47+
m_mem_pool.setDebugName("AllCellToAllEnvCellMemPool");
48+
m_envcell_container.setDebugName("AllCellToAllEnvCellCells");
49+
}
50+
51+
public:
52+
53+
Int32 computeMaxNbEnvPerCell();
54+
void initialize();
55+
void bruteForceUpdate();
56+
void reset();
57+
AllCellToAllEnvCell view() const { return m_all_cell_to_all_env_cell; }
58+
59+
public:
60+
61+
static void updateValues(IMeshMaterialMng* material_mng,
62+
Span<ComponentItemLocalId> mem_pool,
63+
Span<Span<ComponentItemLocalId>> allcell_allenvcell,
64+
Int32 max_nb_env);
65+
66+
private:
67+
68+
IMeshMaterialMng* m_material_mng = nullptr;
69+
Int32 m_size = 0;
70+
NumArray<Span<ComponentItemLocalId>, MDDim1> m_envcell_container;
71+
NumArray<ComponentItemLocalId, MDDim1> m_mem_pool;
72+
Int32 m_current_max_nb_env = 0;
73+
AllCellToAllEnvCell m_all_cell_to_all_env_cell;
4374
};
4475

4576
/*---------------------------------------------------------------------------*/
4677
/*---------------------------------------------------------------------------*/
4778

48-
Int32 AllCellToAllEnvCell::Impl::
49-
_computeMaxNbEnvPerCell(IMeshMaterialMng* material_mng)
79+
Int32 AllCellToAllEnvCellContainer::Impl::
80+
computeMaxNbEnvPerCell()
5081
{
82+
IMeshMaterialMng* material_mng = m_material_mng;
5183
CellToAllEnvCellConverter allenvcell_converter(material_mng);
5284
RunQueue& queue = material_mng->_internalApi()->runQueue();
5385
Accelerator::GenericReducer<Int32> reducer(queue);
@@ -66,11 +98,11 @@ _computeMaxNbEnvPerCell(IMeshMaterialMng* material_mng)
6698
/*---------------------------------------------------------------------------*/
6799
/*---------------------------------------------------------------------------*/
68100

69-
void AllCellToAllEnvCell::Impl::
70-
_updateValues(IMeshMaterialMng* material_mng,
71-
ComponentItemLocalId* mem_pool,
72-
Span<ComponentItemLocalId>* allcell_allenvcell,
73-
Int32 max_nb_env)
101+
void AllCellToAllEnvCellContainer::Impl::
102+
updateValues(IMeshMaterialMng* material_mng,
103+
Span<ComponentItemLocalId> mem_pool,
104+
Span<Span<ComponentItemLocalId>> allcell_allenvcell,
105+
Int32 max_nb_env)
74106
{
75107
// mise a jour des valeurs
76108
CellToAllEnvCellConverter all_env_cell_converter(material_mng);
@@ -90,43 +122,43 @@ _updateValues(IMeshMaterialMng* material_mng,
90122
mem_pool[offset + i] = ComponentItemLocalId(ev._varIndex());
91123
++i;
92124
}
93-
allcell_allenvcell[cid] = Span<ComponentItemLocalId>(mem_pool + offset, nb_env);
125+
allcell_allenvcell[cid] = Span<ComponentItemLocalId>(mem_pool.ptrAt(offset), nb_env);
94126
}
95127
else {
96-
allcell_allenvcell[cid] = Span<ComponentItemLocalId>();
128+
allcell_allenvcell[cid] = {};
97129
}
98130
};
99131
}
100132

101133
/*---------------------------------------------------------------------------*/
102134
/*---------------------------------------------------------------------------*/
103135

104-
void AllCellToAllEnvCell::Impl::
105-
_initialize(AllCellToAllEnvCell* instance)
136+
void AllCellToAllEnvCellContainer::Impl::
137+
initialize()
106138
{
107-
IMeshMaterialMng* mm = instance->m_material_mng;
139+
IMeshMaterialMng* mm = m_material_mng;
108140
RunQueue queue = mm->_internalApi()->runQueue();
109-
instance->m_size = mm->mesh()->cellFamily()->maxLocalId() + 1;
141+
m_size = mm->mesh()->cellFamily()->maxLocalId() + 1;
110142

111-
instance->m_allcell_allenvcell.resize(instance->m_size);
112-
instance->m_allcell_allenvcell_ptr = instance->m_allcell_allenvcell.to1DSpan().data();
143+
m_envcell_container.resize(m_size);
144+
m_all_cell_to_all_env_cell.m_allcell_allenvcell_ptr = m_envcell_container.to1DSpan();
113145

114-
// On force la valeur initiale sur tous les elmts car dans le ENUMERATE_CELL ci-dessous
146+
// On force la valeur initiale sur tous les éléments car dans le ENUMERATE_CELL ci-dessous
115147
// il se peut que m_size (qui vaut maxLocalId()+1) soit different de allCells().size()
116-
instance->m_allcell_allenvcell.fill(Span<ComponentItemLocalId>(), &queue);
148+
m_envcell_container.fill(Span<ComponentItemLocalId>(), &queue);
117149

118-
instance->m_current_max_nb_env = instance->maxNbEnvPerCell();
150+
m_current_max_nb_env = computeMaxNbEnvPerCell();
119151
// TODO: vérifier débordement
120-
Int32 pool_size = instance->m_current_max_nb_env * instance->m_size;
121-
instance->m_mem_pool.resize(pool_size);
122-
instance->m_mem_pool.fill(ComponentItemLocalId(), &queue);
152+
Int32 pool_size = m_current_max_nb_env * m_size;
153+
m_mem_pool.resize(pool_size);
154+
m_mem_pool.fill(ComponentItemLocalId(), &queue);
123155

124-
Span<ComponentItemLocalId> mem_pool_view(instance->m_mem_pool.to1DSpan());
156+
Span<ComponentItemLocalId> mem_pool_view(m_mem_pool.to1DSpan());
125157
CellToAllEnvCellConverter all_env_cell_converter(mm);
126158
auto command = makeCommand(queue);
127-
auto mem_pool = viewOut(command, instance->m_mem_pool);
128-
auto allcell_allenvcell = viewOut(command, instance->m_allcell_allenvcell);
129-
const Int32 max_nb_env = instance->m_current_max_nb_env;
159+
auto mem_pool = viewOut(command, m_mem_pool);
160+
auto allcell_allenvcell = viewOut(command, m_envcell_container);
161+
const Int32 max_nb_env = m_current_max_nb_env;
130162
command << RUNCOMMAND_ENUMERATE (CellLocalId, cid, mm->mesh()->allCells())
131163
{
132164
AllEnvCell all_env_cell = all_env_cell_converter[CellLocalId(cid)];
@@ -147,28 +179,38 @@ _initialize(AllCellToAllEnvCell* instance)
147179
/*---------------------------------------------------------------------------*/
148180
/*---------------------------------------------------------------------------*/
149181

150-
/*---------------------------------------------------------------------------*/
151-
/*---------------------------------------------------------------------------*/
152-
153-
AllCellToAllEnvCell::
154-
AllCellToAllEnvCell(IMeshMaterialMng* mm)
155-
: m_material_mng(mm)
182+
void AllCellToAllEnvCellContainer::Impl::
183+
bruteForceUpdate()
156184
{
157-
m_mem_pool.setDebugName("AllCellToAllEnvCellMemPool");
158-
m_allcell_allenvcell.setDebugName("AllCellToAllEnvCellCells");
185+
// Si les ids ont changé, on doit tout refaire
186+
if (m_size != m_material_mng->mesh()->allCells().itemFamily()->maxLocalId() + 1) {
187+
initialize();
188+
return;
189+
}
190+
191+
Int32 current_max_nb_env(computeMaxNbEnvPerCell());
192+
// Si les ids n'ont pas changé, on regarde si à cet instant, le nb max d'env par maille a changé
193+
// Si ca a changé, refaire le mem pool, sinon, juste update les valeurs
194+
if (current_max_nb_env != m_current_max_nb_env) {
195+
// On n'oublie pas de mettre a jour la nouvelle valeur !
196+
m_current_max_nb_env = current_max_nb_env;
197+
// on recrée le pool
198+
Int32 pool_size = CheckedConvert::multiply(m_current_max_nb_env, m_size);
199+
m_mem_pool.resize(pool_size);
200+
}
201+
// Mise a jour des valeurs
202+
updateValues(m_material_mng, m_mem_pool.to1DSpan(), m_all_cell_to_all_env_cell.m_allcell_allenvcell_ptr, m_current_max_nb_env);
159203
}
160204

161205
/*---------------------------------------------------------------------------*/
162206
/*---------------------------------------------------------------------------*/
163207

164-
void AllCellToAllEnvCell::
208+
void AllCellToAllEnvCellContainer::Impl::
165209
reset()
166210
{
167-
if (m_allcell_allenvcell_ptr) {
168-
m_allcell_allenvcell.resize(0);
169-
m_allcell_allenvcell_ptr = nullptr;
170-
m_mem_pool.resize(0);
171-
}
211+
m_envcell_container.resize(0);
212+
m_all_cell_to_all_env_cell.m_allcell_allenvcell_ptr = {};
213+
m_mem_pool.resize(0);
172214
m_material_mng = nullptr;
173215
m_size = 0;
174216
m_current_max_nb_env = 0;
@@ -177,56 +219,81 @@ reset()
177219
/*---------------------------------------------------------------------------*/
178220
/*---------------------------------------------------------------------------*/
179221

180-
Int32 AllCellToAllEnvCell::
181-
maxNbEnvPerCell() const
222+
/*---------------------------------------------------------------------------*/
223+
/*---------------------------------------------------------------------------*/
224+
225+
AllCellToAllEnvCellContainer::
226+
AllCellToAllEnvCellContainer(IMeshMaterialMng* mm)
227+
: m_p(new Impl(mm))
228+
{
229+
}
230+
231+
/*---------------------------------------------------------------------------*/
232+
/*---------------------------------------------------------------------------*/
233+
234+
AllCellToAllEnvCellContainer::
235+
~AllCellToAllEnvCellContainer()
182236
{
183-
return Impl::_computeMaxNbEnvPerCell(m_material_mng);
237+
delete m_p;
184238
}
185239

186240
/*---------------------------------------------------------------------------*/
187241
/*---------------------------------------------------------------------------*/
188242

189-
void AllCellToAllEnvCell::
243+
void AllCellToAllEnvCellContainer::
244+
reset()
245+
{
246+
m_p->reset();
247+
}
248+
249+
/*---------------------------------------------------------------------------*/
250+
/*---------------------------------------------------------------------------*/
251+
252+
Int32 AllCellToAllEnvCellContainer::
253+
computeMaxNbEnvPerCell() const
254+
{
255+
return m_p->computeMaxNbEnvPerCell();
256+
}
257+
258+
/*---------------------------------------------------------------------------*/
259+
/*---------------------------------------------------------------------------*/
260+
261+
void AllCellToAllEnvCellContainer::
190262
initialize()
191263
{
192-
Impl::_initialize(this);
264+
m_p->initialize();
193265
}
194266

195267
/*---------------------------------------------------------------------------*/
196268
/*---------------------------------------------------------------------------*/
197269

198-
void AllCellToAllEnvCell::
270+
void AllCellToAllEnvCellContainer::
199271
bruteForceUpdate()
200272
{
201-
// Si les ids ont changé, on doit tout refaire
202-
if (m_size != m_material_mng->mesh()->allCells().itemFamily()->maxLocalId() + 1) {
203-
initialize();
204-
return;
205-
}
273+
m_p->bruteForceUpdate();
274+
}
206275

207-
Int32 current_max_nb_env(maxNbEnvPerCell());
208-
// Si les ids n'ont pas changé, on regarde si à cet instant, le nb max d'env par maille a changé
209-
// Si ca a changé, refaire le mem pool, sinon, juste update les valeurs
210-
if (current_max_nb_env != m_current_max_nb_env) {
211-
// On n'oublie pas de mettre a jour la nouvelle valeur !
212-
m_current_max_nb_env = current_max_nb_env;
213-
// Si le nb max d'env pour les mailles a changé à cet instant, on doit refaire le memory pool
214-
ARCANE_CHECK_POINTER(m_allcell_allenvcell_ptr);
215-
// on recrée le pool
216-
Int32 pool_size = CheckedConvert::multiply(m_current_max_nb_env, m_size);
217-
m_mem_pool.resize(pool_size);
218-
}
219-
// Mise a jour des valeurs
220-
Impl::_updateValues(m_material_mng, m_mem_pool.to1DSpan().data(), m_allcell_allenvcell_ptr, m_current_max_nb_env);
276+
/*---------------------------------------------------------------------------*/
277+
/*---------------------------------------------------------------------------*/
278+
279+
AllCellToAllEnvCell AllCellToAllEnvCellContainer::
280+
view() const
281+
{
282+
return m_p->view();
221283
}
222284

223285
/*---------------------------------------------------------------------------*/
224286
/*---------------------------------------------------------------------------*/
225287

288+
/*---------------------------------------------------------------------------*/
289+
/*---------------------------------------------------------------------------*/
290+
226291
CellToAllEnvCellAccessor::
227-
CellToAllEnvCellAccessor(const IMeshMaterialMng* mmmng)
228-
: m_cell_allenvcell(mmmng->_internalApi()->getAllCellToAllEnvCell())
292+
CellToAllEnvCellAccessor(const IMeshMaterialMng* mm)
229293
{
294+
AllCellToAllEnvCellContainer* c = mm->_internalApi()->getAllCellToAllEnvCellContainer();
295+
if (c)
296+
m_cell_allenvcell = c->view();
230297
}
231298

232299
/*---------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)