Skip to content

use league_rank as loop control var #157

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

Merged
jacobmerson merged 1 commit into from
Feb 12, 2025
Merged

use league_rank as loop control var #157

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
32 changes: 16 additions & 16 deletions src/pcms/interpolator/mls_interpolation_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,9 @@ void mls_interpolation(RealConstDefaultScalarArrayView source_values,
Kokkos::parallel_for(
"MLS coefficients", tp.set_scratch_size(0, Kokkos::PerTeam(shared_size)),
KOKKOS_LAMBDA(const member_type& team) {
int i = team.league_rank();
int start_ptr = support.supports_ptr[i];
int end_ptr = support.supports_ptr[i + 1];
int league_rank = team.league_rank();
int start_ptr = support.supports_ptr[league_rank];
int end_ptr = support.supports_ptr[league_rank + 1];
int nsupports = end_ptr - start_ptr;

ScratchMatView local_source_points(team.team_scratch(0), nsupports, dim);
Expand Down Expand Up @@ -674,11 +674,11 @@ void mls_interpolation(RealConstDefaultScalarArrayView source_values,

// evaluates the basis vector of a given target point
Coord target_point;
target_point.x = target_coordinates[i * dim];
target_point.y = target_coordinates[i * dim + 1];
target_point.x = target_coordinates[league_rank * dim];
target_point.y = target_coordinates[league_rank * dim + 1];

if (dim == 3) {
target_point.z = target_coordinates[i * dim + 2];
target_point.z = target_coordinates[league_rank * dim + 2];
}
eval_basis_vector(slice_length, target_point, target_basis_vector);

Expand All @@ -704,10 +704,10 @@ void mls_interpolation(RealConstDefaultScalarArrayView source_values,
Kokkos::parallel_for(
Kokkos::TeamThreadRange(team, nsupports), [=](int j) {
OMEGA_H_CHECK_PRINTF(
radii2[i] > 0,
radii2[j] > 0,
"ERROR: radius2 has to be positive but found to be %.16f\n",
radii2[i]);
compute_phi_vector(target_point, local_source_points, j, radii2[i],
radii2[j]);
compute_phi_vector(target_point, local_source_points, j, radii2[league_rank],
rbf_func, phi_vector);
});

Expand All @@ -717,11 +717,11 @@ void mls_interpolation(RealConstDefaultScalarArrayView source_values,
* quantity that we want interpolate
*/
Kokkos::parallel_for(
Kokkos::TeamThreadRange(team, nsupports), [=](const int i) {
support_values(i) =
source_values[support.supports_idx[start_ptr + i]];
OMEGA_H_CHECK_PRINTF(!std::isnan(support_values(i)),
"ERROR: NaN found: at support %d\n", i);
Kokkos::TeamThreadRange(team, nsupports), [=](const int j) {
support_values(j) =
source_values[support.supports_idx[start_ptr + j]];
OMEGA_H_CHECK_PRINTF(!std::isnan(support_values(j)),
"ERROR: NaN found: at support %d\n", j);
});

team.team_barrier();
Expand All @@ -740,8 +740,8 @@ void mls_interpolation(RealConstDefaultScalarArrayView source_values,
team, result.transformed_rhs, target_basis_vector);

if (team.team_rank() == 0) {
OMEGA_H_CHECK_PRINTF(!std::isnan(target_value), "Nan at %d\n", i);
approx_target_values[i] = target_value;
OMEGA_H_CHECK_PRINTF(!std::isnan(target_value), "Nan at %d\n", league_rank);
approx_target_values[league_rank] = target_value;
}
});
}
Expand Down