Skip to content

Commit ba2050f

Browse files
[arcane,tests] Utilise les nouvelles méthodes de 'NumArray'.
1 parent e2bfec3 commit ba2050f

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

arcane/src/arcane/tests/accelerator/AcceleratorViewsUnitTest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ _executeTest3()
455455
CellGroup own_cells = allCells().own();
456456
Int32 max_local_id = own_cells.itemFamily()->maxLocalId();
457457
NumArray<Int32, MDDim1> checked_local_ids(max_local_id);
458-
checked_local_ids.fill(-1, &queue);
458+
checked_local_ids.fill(-1, queue);
459459
{
460460
// Remplit out_checked_local_ids avec le i-ème localId() du groupe.
461461
auto out_checked_local_ids = ax::viewOut(command, checked_local_ids);

arcane/src/arcane/tests/accelerator/MemoryCopyUnitTest.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ _executeFill(eMemoryRessource mem_kind, bool use_queue, bool use_index)
351351
info() << "Execute Fill memory_ressource=" << mem_kind
352352
<< " use_queue=" << use_queue << " use_index=" << use_index;
353353

354-
auto queue = makeQueue(m_runner);
354+
RunQueue queue = makeQueue(m_runner);
355355
RunQueue* queue_ptr = &queue;
356356
if (!use_queue)
357357
queue_ptr = nullptr;
@@ -409,7 +409,7 @@ _executeFill(eMemoryRessource mem_kind, bool use_queue, bool use_index)
409409
if (use_index) {
410410
NumArray<Int16, MDDim1> filter(eMemoryRessource::Host);
411411
filter.resize(n1);
412-
filter.fill(0);
412+
filter.fillHost(0);
413413
for (Int32 i = 0; i < nb_index; ++i)
414414
filter[indexes[i]] = 1;
415415

arcane/src/arcane/tests/accelerator/NumArrayUnitTest.cc

+10-10
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ _executeTest1(eMemoryRessource mem_kind)
389389
// Tableaux 2D
390390
{
391391
NumArray<double, MDDim2> t1(mem_kind);
392-
t1.resize(n1, n2);
392+
t1.resizeDestructive(n1, n2);
393393
_doRank2(queue, t1, expected_sum2);
394394
}
395395
{
@@ -410,12 +410,12 @@ _executeTest1(eMemoryRessource mem_kind)
410410
// Tableaux 3D
411411
{
412412
NumArray<double, MDDim3, LeftLayout> t1(mem_kind);
413-
t1.resize(n1, n2, n3);
413+
t1.resizeDestructive(n1, n2, n3);
414414
_doRank3(queue, t1, expected_sum3);
415415
}
416416
{
417417
NumArray<double, MDDim3, RightLayout> t1(mem_kind);
418-
t1.resize(n1, n2, n3);
418+
t1.resizeDestructive(n1, n2, n3);
419419
_doRank3(queue, t1, expected_sum3);
420420
}
421421
{
@@ -638,7 +638,7 @@ _executeTest4(eMemoryRessource mem_kind)
638638
out_t1[i] = _getValue(i);
639639
};
640640
NumArray<double, MDDim1> host_t1(eMemoryRessource::Host);
641-
host_t1.copy(_toMDSpan(t1), &queue);
641+
host_t1.copy(_toMDSpan(t1), queue);
642642
double s1 = _doSum(host_t1, { n1 }, &queue);
643643
info() << "SUM1 = " << s1;
644644
vc.areEqual(s1, expected_sum1, "SUM1");
@@ -657,7 +657,7 @@ _executeTest4(eMemoryRessource mem_kind)
657657
};
658658

659659
NumArray<double, MDDim1> host_t2(eMemoryRessource::Host);
660-
host_t2.copy(_toMDSpan(t2), &queue);
660+
host_t2.copy(_toMDSpan(t2), queue);
661661
double s2 = _doSum(host_t2, { n1 }, &queue);
662662
info() << "SUM1_2 = " << s2;
663663
vc.areEqual(s2, expected_sum1, "SUM1_2");
@@ -784,15 +784,15 @@ _arcaneNumArraySamples()
784784
// Redimensionne t2 avec 6x5 valeurs
785785
t2.resize(6);
786786
// Redimensionne t3 avec 2x7x4 valeurs
787-
t3.resize(2, 4);
787+
t3.resizeDestructive(2, 4);
788788
// Redimensionne a1 avec 12 valeurs
789-
a1.resize(12);
789+
a1.resizeDestructive(12);
790790
// Redimensionne a2 avec 3x4 valeurs
791-
a2.resize(3, 4);
791+
a2.resizeDestructive(3, 4);
792792
// Redimensionne a3 avec 2x7x6 valeurs
793-
a3.resize(2, 7, 6);
793+
a3.resizeDestructive(2, 7, 6);
794794
// Redimensionne a1 avec 2x9x4x6 valeurs
795-
a4.resize(2, 9, 4, 6);
795+
a4.resizeDestructive(2, 9, 4, 6);
796796
//![SampleNumArrayResize]
797797

798798
//![SampleNumArrayDeclarationsMemory]

0 commit comments

Comments
 (0)