Merge pull request #897 from eth-cscs/fix_array

Fix openacc_cuda_mpi_cppstd.F90

Author: ajocksch

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<<<NUMBER_OF_BLOCKS, THREADS_PER_BLOCK>>>(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<<<NUMBER_OF_BLOCKS, THREADS_PER_BLOCK>>>(d_a, d_b, n);
-  cudaThreadSynchronize();
+  cudaDeviceSynchronize();
 
   cudaMemcpy(a, d_a, n*sizeof(float), cudaMemcpyDeviceToHost);
 

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(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)