Skip to content
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.

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

Add method ItemGenericInfoListView::isShared() #2018

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions arcane/src/arcane/core/ItemGenericInfoListView.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,18 @@ class ARCANE_CORE_EXPORT ItemGenericInfoListView
return ItemFlags::isOwn(m_flags[local_id]);
}

//! Indique si l'entité de numéro local \a local_id est partagée par d'autres sous-domaines
constexpr ARCCORE_HOST_DEVICE bool isShared(Int32 local_id) const
{
return ItemFlags::isShared(m_flags[local_id]);
}

//! Indique si l'entité de numéro local \a local_id est partagée par d'autres sous-domaines
constexpr ARCCORE_HOST_DEVICE bool isShared(ItemLocalId local_id) const
{
return ItemFlags::isShared(m_flags[local_id]);
}

private:

// NOTE: Cette structure est utilisée dans le wrapping C#.
Expand Down
16 changes: 13 additions & 3 deletions arcane/src/arcane/tests/accelerator/AcceleratorItemInfoUnitTest.cc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
//-----------------------------------------------------------------------------
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
// See the top-level COPYRIGHT file for details.
// SPDX-License-Identifier: Apache-2.0
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
/* AcceleratorItemInfoUnitTest.cc (C) 2000-2024 */
/* AcceleratorItemInfoUnitTest.cc (C) 2000-2025 */
/* */
/* Service de test unitaire des 'ItemGenericInfoListView'. */
/*---------------------------------------------------------------------------*/
Expand Down Expand Up @@ -45,7 +45,7 @@
{
public:

explicit AcceleratorItemInfoUnitTest(const ServiceBuildInfo& cb);
explicit AcceleratorItemInfoUnitTest(const ServiceBuildInfo& sb);

public:

Expand Down Expand Up @@ -95,10 +95,12 @@
VariableCellInt64 var_unique_ids(VariableBuildInfo(mesh(), "TestUniqueIds"));
VariableCellInt16 var_type_ids(VariableBuildInfo(mesh(), "TestTypeIds"));
VariableCellInt32 var_owners(VariableBuildInfo(mesh(), "TestOwners"));
VariableCellInt16 var_is_shared(VariableBuildInfo(mesh(), "TestIsShared"));

VariableCellInt64 var_unique_ids2(VariableBuildInfo(mesh(), "TestUniqueIds2"));
VariableCellInt16 var_type_ids2(VariableBuildInfo(mesh(), "TestTypeIds2"));
VariableCellInt32 var_owners2(VariableBuildInfo(mesh(), "TestOwners2"));
VariableCellInt16 var_is_shared2(VariableBuildInfo(mesh(), "TestIsShared2"));

auto* queue = subDomain()->acceleratorMng()->defaultQueue();
ItemGenericInfoListView cells_info(mesh()->cellFamily());
Expand All @@ -108,21 +110,25 @@
auto out_unique_ids = viewOut(command, var_unique_ids);
auto out_type_ids = viewOut(command, var_type_ids);
auto out_owners = viewOut(command, var_owners);
auto out_is_shared = viewOut(command, var_is_shared);

auto out_unique_ids2 = viewOut(command, var_unique_ids2);
auto out_type_ids2 = viewOut(command, var_type_ids2);
auto out_owners2 = viewOut(command, var_owners2);
auto out_is_shared2 = viewOut(command, var_is_shared2);

command << RUNCOMMAND_ENUMERATE (Cell, vi, allCells())
{
Int32 lid = vi.localId();
out_unique_ids[vi] = cells_info.uniqueId(vi);
out_type_ids[vi] = cells_info.typeId(vi);
out_owners[vi] = cells_info.owner(vi);
out_is_shared[vi] = cells_info.isShared(vi);

out_unique_ids2[vi] = cells_info.uniqueId(lid);
out_type_ids2[vi] = cells_info.typeId(lid);
out_owners2[vi] = cells_info.owner(lid);
out_is_shared2[vi] = cells_info.isShared(vi);
};
}

Expand All @@ -136,13 +142,17 @@
ARCANE_FATAL("Bad 1 typeId() expected={0} current={1}", cell.itemTypeId(), var_type_ids[cell]);
if (cell.owner() != var_owners[cell])
ARCANE_FATAL("Bad 1 owner() expected={0} current={1}", cell.owner(), var_owners[cell]);
if (cell.isShared() != var_is_shared[cell])
ARCANE_FATAL("Bad 1 isShared() expected={0} current={1}", cell.isShared(), var_is_shared[cell]);

Check warning on line 146 in arcane/src/arcane/tests/accelerator/AcceleratorItemInfoUnitTest.cc

View check run for this annotation

Codecov / codecov/patch

arcane/src/arcane/tests/accelerator/AcceleratorItemInfoUnitTest.cc#L146

Added line #L146 was not covered by tests

if (cell.uniqueId() != var_unique_ids2[cell])
ARCANE_FATAL("Bad 2 uniqueId() expected={0} current={1}", cell.uniqueId(), var_unique_ids[cell]);
if (cell.itemTypeId() != var_type_ids2[cell])
ARCANE_FATAL("Bad 2 typeId() expected={0} current={1}", cell.itemTypeId(), var_type_ids[cell]);
if (cell.owner() != var_owners2[cell])
ARCANE_FATAL("Bad 2 owner() expected={0} current={1}", cell.owner(), var_owners[cell]);
if (cell.isShared() != var_is_shared2[cell])
ARCANE_FATAL("Bad 2 isShared() expected={0} current={1}", cell.isShared(), var_is_shared2[cell]);

Check warning on line 155 in arcane/src/arcane/tests/accelerator/AcceleratorItemInfoUnitTest.cc

View check run for this annotation

Codecov / codecov/patch

arcane/src/arcane/tests/accelerator/AcceleratorItemInfoUnitTest.cc#L155

Added line #L155 was not covered by tests
}
}

Expand Down
Loading