From 9d6db3f424a165865658b47e865b421ef6c0dbf3 Mon Sep 17 00:00:00 2001
From: Artem Zhmurov <zhmurov@gmail.com>
Date: Fri, 14 Aug 2020 14:16:01 +0000
Subject: [PATCH] Fix DeviceStreamManager tests

Wrong CMake macros was used which lead to DeviceStreamManager not
running for GPU builds.
---
 src/gromacs/gpu_utils/tests/CMakeLists.txt         |  4 +++-
 .../gpu_utils/tests/pinnedmemorychecker.cpp        | 22 ++++++++++++++--------
 src/gromacs/gpu_utils/tests/typecasts.cpp          | 20 +++++++++++++-------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/gromacs/gpu_utils/tests/CMakeLists.txt b/src/gromacs/gpu_utils/tests/CMakeLists.txt
index e54ac254d1..93e385806b 100644
--- a/src/gromacs/gpu_utils/tests/CMakeLists.txt
+++ b/src/gromacs/gpu_utils/tests/CMakeLists.txt
@@ -44,7 +44,10 @@ gmx_add_unit_test(GpuUtilsUnitTests gpu_utils-test
         gputest.cpp
         # Tests of code
         clfftinitializer.cpp
+        device_stream_manager.cpp
         hostallocator.cpp
+        pinnedmemorychecker.cpp
+        typecasts.cpp
 
     CUDA_CU_SOURCE_FILES
         devicetransfers.cu
@@ -54,6 +57,5 @@ gmx_add_unit_test(GpuUtilsUnitTests gpu_utils-test
         devicetransfers_ocl.cpp
 
     NON_GPU_CPP_SOURCE_FILES
-        device_stream_manager.cpp
         devicetransfers.cpp
     )
diff --git a/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp b/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
index 3d518cb74b..2becac6534 100644
--- a/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
+++ b/src/gromacs/gpu_utils/tests/pinnedmemorychecker.cpp
@@ -40,17 +40,21 @@
  */
 #include "gmxpre.h"
 
-#include <vector>
+#include "config.h"
 
-#include <gtest/gtest.h>
+#if GMX_GPU_CUDA
 
-#include "gromacs/gpu_utils/gpu_utils.h"
-#include "gromacs/gpu_utils/hostallocator.h"
-#include "gromacs/gpu_utils/pmalloc_cuda.h"
-#include "gromacs/utility/real.h"
-#include "gromacs/utility/smalloc.h"
+#    include <vector>
 
-#include "gputest.h"
+#    include <gtest/gtest.h>
+
+#    include "gromacs/gpu_utils/gpu_utils.h"
+#    include "gromacs/gpu_utils/hostallocator.h"
+#    include "gromacs/gpu_utils/pmalloc_cuda.h"
+#    include "gromacs/utility/real.h"
+#    include "gromacs/utility/smalloc.h"
+
+#    include "gputest.h"
 
 namespace gmx
 {
@@ -128,3 +132,5 @@ TEST_F(PinnedMemoryCheckerTest, PinnedCBufferIsRecognized)
 } // namespace
 } // namespace test
 } // namespace gmx
+
+#endif // GMX_GPU_CUDA
diff --git a/src/gromacs/gpu_utils/tests/typecasts.cpp b/src/gromacs/gpu_utils/tests/typecasts.cpp
index 7c5301c9f8..319813828b 100644
--- a/src/gromacs/gpu_utils/tests/typecasts.cpp
+++ b/src/gromacs/gpu_utils/tests/typecasts.cpp
@@ -40,17 +40,21 @@
  */
 #include "gmxpre.h"
 
-#include <vector>
+#include "config.h"
 
-#include <gtest/gtest.h>
+#if GMX_GPU_CUDA
 
-#include "gromacs/gpu_utils/gpu_testutils.h"
-#include "gromacs/utility/exceptions.h"
+#    include <vector>
 
-#include "testutils/testasserts.h"
-#include "testutils/testmatchers.h"
+#    include <gtest/gtest.h>
 
-#include "typecasts_runner.h"
+#    include "gromacs/gpu_utils/gpu_testutils.h"
+#    include "gromacs/utility/exceptions.h"
+
+#    include "testutils/testasserts.h"
+#    include "testutils/testmatchers.h"
+
+#    include "typecasts_runner.h"
 
 namespace gmx
 {
@@ -80,3 +84,5 @@ TEST(GpuDataTypesCompatibilityTest, RVecAndFloat3OnDevice)
 
 } // namespace test
 } // namespace gmx
+
+#endif // GMX_GPU_CUDA
-- 
2.11.4.GIT