Skip to content

[test] Fix openacc_cuda_mpi_cppstd.F90 #897

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
merged 4 commits into from
Aug 13, 2019
Merged

[test] Fix openacc_cuda_mpi_cppstd.F90 #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a6a2d6
Update openacc_cuda_mpi_cppstd.F90
lucamar Aug 9, 2019
f140ad5
Update compute_cuda.cu
lucamar Aug 9, 2019
7f6e05a
Update cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90
lucamar Aug 13, 2019
d423929
Update cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90
lucamar Aug 13, 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
8 changes: 4 additions & 4 deletions cscs-checks/mch/src/compute_cuda.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ void cuda_kernel_no_copy(float* a, float* b, int n)
const int THREADS_PER_BLOCK = 1;
const int NUMBER_OF_BLOCKS = 10;

cudaThreadSynchronize();
cudaDeviceSynchronize();
simple_add<<<NUMBER_OF_BLOCKS, THREADS_PER_BLOCK>>>(a, b, n);
cudaThreadSynchronize();
cudaDeviceSynchronize();

cudaCheckErrors("cuda error");
}
Expand All @@ -47,9 +47,9 @@ void cuda_kernel_with_copy(float* a, float* b, int n)
cudaMemcpy(d_a, a, n*sizeof(float), cudaMemcpyHostToDevice);
cudaMemcpy(d_b, b, n*sizeof(float), cudaMemcpyHostToDevice);

cudaThreadSynchronize();
cudaDeviceSynchronize();
simple_add<<<NUMBER_OF_BLOCKS, THREADS_PER_BLOCK>>>(d_a, d_b, n);
cudaThreadSynchronize();
cudaDeviceSynchronize();

cudaMemcpy(a, d_a, n*sizeof(float), cudaMemcpyDeviceToHost);

Expand Down
4 changes: 2 additions & 2 deletions cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ program openacc_cuda_mpi_cppstd
if (sum(f1) /= EXPECTED_CUDA_SUM) then
write (*,*) "Result : FAIL"
write (*,*) "Expected value sum(f1): ", EXPECTED_CUDA_SUM, "actual value:", sum(f1)
else if (sum(f3) /= EXPECTED_CPP_STD_SUM) then
else if (sum(f3) /= EXPECTED_CUDA_SUM) then
write (*,*) "Result : FAIL"
write (*,*) "Expected value sum(f3): ", EXPECTED_CPP_STD_SUM, "actual value:", sum(f3)
write (*,*) "Expected value sum(f3): ", EXPECTED_CUDA_SUM, "actual value:", sum(f3)
else if (data_sum(1) /= ref_val) then
write (*,*) "Result : FAIL"
write (*,*) "Expected value data_sum: ", ref_val, "actual value:", data_sum(1)
Expand Down