From 4a6a2d6fc48707028b61c6140b5551f1431893c1 Mon Sep 17 00:00:00 2001 From: lucamar Date: Fri, 9 Aug 2019 15:16:05 +0200 Subject: [PATCH 1/4] Update openacc_cuda_mpi_cppstd.F90 --- cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 b/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 index 2e81680440..ef0de8552c 100644 --- a/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 +++ b/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 @@ -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(f2) /= EXPECTED_CPP_STD_SUM) then write (*,*) "Result : FAIL" - write (*,*) "Expected value sum(f3): ", EXPECTED_CPP_STD_SUM, "actual value:", sum(f3) + write (*,*) "Expected value sum(f2): ", EXPECTED_CPP_STD_SUM, "actual value:", sum(f2) else if (data_sum(1) /= ref_val) then write (*,*) "Result : FAIL" write (*,*) "Expected value data_sum: ", ref_val, "actual value:", data_sum(1) From f140ad54654c795a36ce84b17ce395d6fd6c70f3 Mon Sep 17 00:00:00 2001 From: lucamar Date: Fri, 9 Aug 2019 15:47:13 +0200 Subject: [PATCH 2/4] Update compute_cuda.cu Replace deprecated cudaThreadSynchronize() with cudaDeviceSynchronize() --- cscs-checks/mch/src/compute_cuda.cu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cscs-checks/mch/src/compute_cuda.cu b/cscs-checks/mch/src/compute_cuda.cu index bd77a2d23c..28fd71e761 100644 --- a/cscs-checks/mch/src/compute_cuda.cu +++ b/cscs-checks/mch/src/compute_cuda.cu @@ -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<<>>(a, b, n); - cudaThreadSynchronize(); + cudaDeviceSynchronize(); cudaCheckErrors("cuda error"); } @@ -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<<>>(d_a, d_b, n); - cudaThreadSynchronize(); + cudaDeviceSynchronize(); cudaMemcpy(a, d_a, n*sizeof(float), cudaMemcpyDeviceToHost); From 7f6e05a34d4e9f26672e4a0bebeb663400442e13 Mon Sep 17 00:00:00 2001 From: lucamar Date: Tue, 13 Aug 2019 09:08:28 +0200 Subject: [PATCH 3/4] Update cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 Co-Authored-By: Andreas Jocksch --- cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 b/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 index ef0de8552c..c2b4762765 100644 --- a/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 +++ b/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 @@ -74,7 +74,7 @@ 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(f2) /= EXPECTED_CPP_STD_SUM) then + else if (sum(f3) /= EXPECTED_CUDA_SUM) then write (*,*) "Result : FAIL" write (*,*) "Expected value sum(f2): ", EXPECTED_CPP_STD_SUM, "actual value:", sum(f2) else if (data_sum(1) /= ref_val) then From d423929c8a87cf1e1310dc8e5b77d63ac1c5f463 Mon Sep 17 00:00:00 2001 From: lucamar Date: Tue, 13 Aug 2019 09:08:58 +0200 Subject: [PATCH 4/4] Update cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 Co-Authored-By: Andreas Jocksch --- cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 b/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 index c2b4762765..4df1293702 100644 --- a/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 +++ b/cscs-checks/mch/src/openacc_cuda_mpi_cppstd.F90 @@ -76,7 +76,7 @@ program openacc_cuda_mpi_cppstd write (*,*) "Expected value sum(f1): ", EXPECTED_CUDA_SUM, "actual value:", sum(f1) else if (sum(f3) /= EXPECTED_CUDA_SUM) then write (*,*) "Result : FAIL" - write (*,*) "Expected value sum(f2): ", EXPECTED_CPP_STD_SUM, "actual value:", sum(f2) + 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)