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.

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

Jump to bottom

Use Kokkos in functions struct replacing TBB #14633

Closed
wants to merge 7 commits into from
Closed

Use Kokkos in functions struct replacing TBB #14633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1477996
Use Kokkos in functions struct replacing TBB
masterleinad Jan 3, 2023
986a3b4
Convert more
masterleinad Jan 5, 2023
207fa81
Fix ReadWriteVector
masterleinad Jan 5, 2023
946ff93
Try making MSVC happy
masterleinad Jan 5, 2023
a10026c
Fix up vector.templates.h
masterleinad Jan 6, 2023
b05ca41
Remove unused variable
masterleinad Jan 6, 2023
492a38c
Merge remote-tracking branch 'upstream/master' into kokkos_replace_tb…
masterleinad Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion include/deal.II/base/memory_space_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ namespace MemorySpace
{
MemorySpaceData();

MemorySpaceData(
Kokkos::View<T *, typename MemorySpace::kokkos_space> values);

/**
* Copy the class member values to @p begin.
* If the data is on the device it is moved to the host.
Expand Down Expand Up @@ -113,7 +116,12 @@ namespace MemorySpace
0))
{}


template <typename T, typename MemorySpace>
MemorySpaceData<T, MemorySpace>::MemorySpaceData(
Kokkos::View<T *, typename MemorySpace::kokkos_space> new_values)
: values_host_buffer(Kokkos::View<T *, Kokkos::HostSpace>("host buffer", 0))
, values(new_values)
Comment on lines +121 to +123
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're just copying new_values twice this way. Make it a const reference to avoid one of them.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't need this constructor anymore anyway. It probably makes sense to replace MemorySpaceData with Kokkos::View at least internally in most places.

{}

template <typename T, typename MemorySpace>
void
Expand Down
102 changes: 32 additions & 70 deletions include/deal.II/lac/la_parallel_vector.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,11 +887,10 @@ namespace LinearAlgebra
if (partitioner->locally_owned_size() > 0)
{
dealii::internal::VectorOperations::
functions<Number, Number2, MemorySpaceType>::copy(
thread_loop_partitioner,
partitioner->locally_owned_size(),
src.data,
data);
functions<Number, Number2, MemorySpaceType>::template copy<
MemorySpaceType>(partitioner->locally_owned_size(),
src.data.values,
data.values);
}
}

Expand All @@ -911,8 +910,11 @@ namespace LinearAlgebra
Assert(partitioner->ghost_indices() == src.partitioner->ghost_indices(),
ExcMessage("Ghost indices should be identical."));
::dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::import_elements(
thread_loop_partitioner, allocated_size, operation, src.data, data);
functions<Number, Number, MemorySpaceType>::template import_elements<
MemorySpaceType2>(allocated_size,
operation,
src.data.values,
data.values);
}


Expand Down Expand Up @@ -1151,7 +1153,6 @@ namespace LinearAlgebra
data.values_host_buffer =
Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{},
data.values);

partitioner->export_to_ghosted_array_start<Number, MemorySpace::Host>(
communication_channel,
ArrayView<const Number, MemorySpace::Host>(
Expand Down Expand Up @@ -1386,8 +1387,9 @@ namespace LinearAlgebra
if (this_size > 0)
{
dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::set(
thread_loop_partitioner, this_size, s, data);
functions<Number, Number, MemorySpaceType>::set(this_size,
s,
data.values);
}

// if we call Vector::operator=0, we want to zero out all the entries
Expand Down Expand Up @@ -1431,10 +1433,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::add_vector(
thread_loop_partitioner,
partitioner->locally_owned_size(),
v.data,
data);
partitioner->locally_owned_size(), v.data.values, data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand All @@ -1459,10 +1458,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::subtract_vector(
thread_loop_partitioner,
partitioner->locally_owned_size(),
v.data,
data);
partitioner->locally_owned_size(), v.data.values, data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand All @@ -1480,7 +1476,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::add_factor(
thread_loop_partitioner, partitioner->locally_owned_size(), a, data);
partitioner->locally_owned_size(), a, data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand Down Expand Up @@ -1509,11 +1505,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::add_av(
thread_loop_partitioner,
partitioner->locally_owned_size(),
a,
v.data,
data);
partitioner->locally_owned_size(), a, v.data.values, data.values);
}


Expand Down Expand Up @@ -1555,13 +1547,12 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::add_avpbw(
thread_loop_partitioner,
partitioner->locally_owned_size(),
a,
b,
v.data,
w.data,
data);
v.data.values,
w.data.values,
data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand Down Expand Up @@ -1593,11 +1584,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::sadd_xv(
thread_loop_partitioner,
partitioner->locally_owned_size(),
x,
v.data,
data);
partitioner->locally_owned_size(), x, v.data.values, data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand All @@ -1624,12 +1611,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::sadd_xav(
thread_loop_partitioner,
partitioner->locally_owned_size(),
x,
a,
v.data,
data);
partitioner->locally_owned_size(), x, a, v.data.values, data.values);
}


Expand All @@ -1656,10 +1638,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::multiply_factor(
thread_loop_partitioner,
partitioner->locally_owned_size(),
factor,
data);
partitioner->locally_owned_size(), factor, data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand Down Expand Up @@ -1692,8 +1671,9 @@ namespace LinearAlgebra
AssertDimension(locally_owned_size(), v.locally_owned_size());

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::scale(
thread_loop_partitioner, locally_owned_size(), v.data, data);
functions<Number, Number, MemorySpaceType>::scale(locally_owned_size(),
v.data.values,
data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand All @@ -1717,12 +1697,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::equ_au(
thread_loop_partitioner,
partitioner->locally_owned_size(),
a,
v.data,
data);

partitioner->locally_owned_size(), a, v.data.values, data.values);

if (vector_is_ghosted)
update_ghost_values();
Expand Down Expand Up @@ -1753,10 +1728,7 @@ namespace LinearAlgebra

return dealii::internal::VectorOperations::
functions<Number, Number2, MemorySpaceType>::dot(
thread_loop_partitioner,
partitioner->locally_owned_size(),
v.data,
data);
partitioner->locally_owned_size(), v.data.values, data.values);
}


Expand Down Expand Up @@ -1790,10 +1762,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::norm_2(
thread_loop_partitioner,
partitioner->locally_owned_size(),
sum,
data);
partitioner->locally_owned_size(), sum, data.values);

AssertIsFinite(sum);

Expand All @@ -1813,7 +1782,7 @@ namespace LinearAlgebra

Number sum = ::dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::mean_value(
thread_loop_partitioner, partitioner->locally_owned_size(), data);
partitioner->locally_owned_size(), data.values);

return sum / real_type(partitioner->locally_owned_size());
}
Expand Down Expand Up @@ -1845,10 +1814,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::norm_1(
thread_loop_partitioner,
partitioner->locally_owned_size(),
sum,
data);
partitioner->locally_owned_size(), sum, data.values);

return sum;
}
Expand Down Expand Up @@ -1900,11 +1866,7 @@ namespace LinearAlgebra

dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::norm_p(
thread_loop_partitioner,
partitioner->locally_owned_size(),
sum,
p,
data);
partitioner->locally_owned_size(), sum, p, data.values);

return std::pow(sum, 1. / p);
}
Expand Down Expand Up @@ -1970,7 +1932,7 @@ namespace LinearAlgebra

Number sum = dealii::internal::VectorOperations::
functions<Number, Number, MemorySpaceType>::add_and_dot(
thread_loop_partitioner, vec_size, a, v.data, w.data, data);
vec_size, a, v.data.values, w.data.values, data.values);

AssertIsFinite(sum);

Expand Down