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

Update miniAero for Kokkos 3.0 promotion. #3

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update miniAero for Kokkos 3.0 promotion. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b03f15
Update Makefile.
Jul 17, 2019
a1f448a
Update older, ::fence() calls when deprecated code is turned off.
Jul 17, 2019
1c60ad2
Remove Experimental namespace scope resolution when deprecated code i…
Jul 17, 2019
26f43b0
Update deprecated 'dimension' functions in favor of ISO/C++ vocabular…
Jul 17, 2019
e549b3d
Reset Makefile.
Jul 17, 2019
636a661
Use Kokkos::fence()
Jul 17, 2019
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
10 changes: 5 additions & 5 deletions kokkos/Faces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct printfunctor {

KOKKOS_INLINE_FUNCTION
void operator() (int i) const {
if(view(i)>=view.dimension_0())
if(view(i)>=view.extent(0))
printf("%i %i\n",i,view(i));
}
};
Expand Down Expand Up @@ -125,20 +125,20 @@ void copy_faces(Faces<Device> device_faces, std::vector<Face> & mesh_faces){
Kokkos::deep_copy(device_faces.face_tangent_, face_tangent);
Kokkos::deep_copy(device_faces.face_binormal_, face_binormal);

if(device_faces.face_cell_conn_.dimension_0() > 0) {
if(device_faces.face_cell_conn_.extent(0) > 0) {
typedef Kokkos::View<int *, Kokkos::LayoutStride, Device> view_type;
typedef Kokkos::BinOp1D< view_type > CompType;
view_type face_cell_left = Kokkos::subview(device_faces.face_cell_conn_,Kokkos::ALL(),0);

typedef Kokkos::Experimental::MinMax<int,Device> reducer_type;
typedef Kokkos::MinMax<int,Device> reducer_type;
typedef typename reducer_type::value_type minmax_type;
minmax_type minmax;
Kokkos::parallel_reduce(face_cell_left.dimension_0(), KOKKOS_LAMBDA (const int& i, minmax_type& lminmax) {
Kokkos::parallel_reduce(face_cell_left.extent(0), KOKKOS_LAMBDA (const int& i, minmax_type& lminmax) {
if(face_cell_left(i)<lminmax.min_val) lminmax.min_val = face_cell_left(i);
if(face_cell_left(i)>lminmax.max_val) lminmax.max_val = face_cell_left(i);
},reducer_type(minmax));

Kokkos::BinSort<view_type, CompType, Device, int> bin_sort(face_cell_left,CompType(face_cell_left.dimension_0()/2,minmax.min_val,minmax.max_val),true);
Kokkos::BinSort<view_type, CompType, Device, int> bin_sort(face_cell_left,CompType(face_cell_left.extent(0)/2,minmax.min_val,minmax.max_val),true);
bin_sort.create_permute_vector();
Kokkos::deep_copy(device_faces.permute_vector_, bin_sort.sort_order);
}
Expand Down
36 changes: 18 additions & 18 deletions kokkos/GreenGauss.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ void operator()( const int& ii )const{
const int i = permute_vector_(ii);
const int left_index = face_cell_conn_(i,0);
const int right_index = face_cell_conn_(i,1);

const double gamma = 1.4;
const double Rgas = 287.05;

const double left_r = cell_values_(left_index, 0);
const double left_ri = 1.0 / left_r;
const double left_u = cell_values_(left_index, 1) * left_ri;
Expand All @@ -94,7 +94,7 @@ void operator()( const int& ii )const{
const double left_T = left_e * (gamma - 1.0) / Rgas;

const double primitives_l[5] = { left_r, left_u, left_v, left_w, left_T };

const double right_r = cell_values_(right_index, 0);
const double right_ri = 1.0 / right_r;
const double right_u = cell_values_(right_index, 1) * right_ri;
Expand All @@ -110,18 +110,18 @@ void operator()( const int& ii )const{
const double cell_vol_right = cell_volumes_(right_index);
const int cell_ind_0 = cell_flux_index_(i,0);
const int cell_ind_1 = cell_flux_index_(i,1);

for(int idir = 0; idir < 3; ++idir)
{
const double face_norm = face_normal_(i,idir);

for(int icomp = 0; icomp < 5; ++icomp) {
const double gradient = 0.5*(primitives_l[icomp]+primitives_r[icomp])*face_norm;

#ifdef ATOMICS_FLUX
double * left_cell = &cell_gradient_(left_index,0,icomp,idir);
Kokkos::atomic_add(left_cell, gradient/cell_vol_left);

double * right_cell = &cell_gradient_(right_index,0,icomp,idir);
Kokkos::atomic_add(right_cell, -gradient/cell_vol_right);
#endif
Expand Down Expand Up @@ -167,13 +167,13 @@ struct green_gauss_boundary_face{
KOKKOS_INLINE_FUNCTION
void operator()( int i )const{
int index = face_cell_conn_(i,0);

const double gamma = 1.4;
const double Rgas = 287.05;

double gradient[5][3];
double primitives[5];

const double r = cell_values_(index, 0);
const double ri = 1.0 / r;
const double u = cell_values_(index, 1) * ri;
Expand All @@ -182,13 +182,13 @@ void operator()( int i )const{
const double k = 0.5 * (u * u + v * v + w * w);
const double e = cell_values_(index, 4) * ri - k;
const double T = e * (gamma - 1.0) / Rgas;

primitives[0] = r;
primitives[1] = u;
primitives[2] = v;
primitives[3] = w;
primitives[4] = T;

for(int icomp = 0; icomp < 5; ++icomp)
{
for(int idir = 0; idir < 3; ++idir)
Expand Down Expand Up @@ -245,7 +245,7 @@ void operator()( int i )const{

for(int icomp = 0; icomp < 5; ++icomp)
{

for(int idir = 0; idir < 3; ++idir)
{
gradient_(i,icomp,idir) = 0;
Expand Down Expand Up @@ -302,7 +302,7 @@ class GreenGauss {
const int ninternal_faces = internal_faces_->nfaces_;
green_gauss_face<Device> face_gradient(*internal_faces_, sol_np1_vec, *cells_);
Kokkos::parallel_for(ninternal_faces, face_gradient);

//Boundary Faces
typename std::vector<Faces<Device> *>::iterator bcf_iter, bcf_iter_end;
bcf_iter = bc_faces_->begin();
Expand All @@ -313,28 +313,28 @@ class GreenGauss {
green_gauss_boundary_face<Device> bc_gradient(*faces, sol_np1_vec, *cells_);
Kokkos::parallel_for(nboundary_faces, bc_gradient);
}

//Sum of all contributions.
green_gauss_gradient_sum<Device> gradient_sum(*cells_, gradients);
Kokkos::parallel_for(mesh_data_->num_owned_cells, gradient_sum);
Device::fence();
Kokkos::fence();
}

//communicate the computed gradient for ghost cells.
void communicate_gradients(gradient_field_type gradients){
//copy values to be send from device to host
extract_shared_tensor<Device, 5, 3> extract_shared_gradients(gradients, mesh_data_->send_local_ids, shared_gradient_vars);//sol_np1_vec, send_local_ids, shared_cells);
Kokkos::parallel_for(mesh_data_->num_ghosts,extract_shared_gradients);
Device::fence();
Kokkos::fence();
Kokkos::deep_copy(shared_gradient_vars_host, shared_gradient_vars);

communicate_ghosted_cell_data(mesh_data_->sendCount, mesh_data_->recvCount, shared_gradient_vars_host.ptr_on_device(),ghosted_gradient_vars_host.ptr_on_device(), 15);

//copy values to be sent from host to device
Kokkos::deep_copy(ghosted_gradient_vars, ghosted_gradient_vars_host);
insert_ghost_tensor<Device, 5, 3> insert_ghost_gradients(gradients, mesh_data_->recv_local_ids, ghosted_gradient_vars);
Kokkos::parallel_for(mesh_data_->num_ghosts, insert_ghost_gradients);
Device::fence();
Kokkos::fence();
}

private:
Expand Down
8 changes: 4 additions & 4 deletions kokkos/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
KOKKOS_PATH = ${HOME}/kokkos
KOKKOS_DEVICES=OpenMP
KOKKOS_DEVICES = OpenMP

default: build
echo "Start Build"

ifneq (,$(findstring Cuda,$(KOKKOS_DEVICES)))
CXX = ${KOKKOS_PATH}/config/nvcc_wrapper
CXX = ${KOKKOS_PATH}/bin/nvcc_wrapper
EXE = miniAero.cuda
KOKKOS_ARCH = "SNB,Kepler35"
KOKKOS_CUDA_OPTIONS=enable_lambda
KOKKOS_ARCH = "Maxwell52"
KOKKOS_CUDA_OPTIONS = enable_lambda
else
CXX = g++
EXE = miniAero.host
Expand Down
Loading