add gpu python op test

paddle/framework/detail/tensor-inl.h

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-
+#include <string>
 #include "paddle/memory/memcpy.h"
 
 namespace paddle {
@@ -62,9 +62,11 @@ inline T* Tensor::mutable_data(platform::Place place) {
     if (platform::is_cpu_place(place)) {
       holder_.reset(new PlaceholderImpl<T, platform::CPUPlace>(
           boost::get<platform::CPUPlace>(place), size));
+    } else if (platform::is_gpu_place(place)) {
+#ifdef PADDLE_ONLY_CPU
+      PADDLE_THROW("'GPUPlace' is not supported in CPU only device.");
     }
-#ifndef PADDLE_ONLY_CPU
+#else
-    else if (platform::is_gpu_place(place)) {
       holder_.reset(new PlaceholderImpl<T, platform::GPUPlace>(
           boost::get<platform::GPUPlace>(place), size));
     }

paddle/platform/enforce.h

@@ -136,7 +136,7 @@ inline void throw_on_error(T e) {
   do {                                                                 \
     throw ::paddle::platform::EnforceNotMet(                           \
         std::make_exception_ptr(                                       \
-            std::runtime_error(string::Sprintf(__VA_ARGS__))), \
+            std::runtime_error(paddle::string::Sprintf(__VA_ARGS__))), \
         __FILE__, __LINE__);                                           \
   } while (0)
 

paddle/pybind/pybind.cc

@@ -56,6 +56,14 @@ static size_t UniqueIntegerGenerator() {
   return generator.fetch_add(1);
 }
 
+bool IsCompileGPU() {
+#ifdef PADDLE_ONLY_CPU
+  return false;
+#else
+  return true;
+#endif
+}
+
 PYBIND11_PLUGIN(core) {
   py::module m("core", "C++ core of PaddlePaddle");
 
@@ -148,18 +156,23 @@ All parameter, weight, gradient are variables in Paddle.
       .def("temp", pd::OperatorBase::TMP_VAR_NAME);
 
   py::class_<paddle::platform::DeviceContext>(m, "DeviceContext")
-      .def_static("cpu_context",
+      .def_static("create",
-                  []() -> paddle::platform::DeviceContext* {
+                  [](paddle::platform::CPUPlace& place)
+                      -> paddle::platform::DeviceContext* {
                     return new paddle::platform::CPUDeviceContext();
                   })
-#ifndef PADDLE_ONLY_CPU
+      .def_static(
-      .def_static("gpu_context",
+          "create",
           [](paddle::platform::GPUPlace& place)
               -> paddle::platform::DeviceContext* {
+#ifdef PADDLE_ONLY_CPU
+            PADDLE_THROW("'GPUPlace' is not supported in CPU only device.");
+
+#else
             return new paddle::platform::CUDADeviceContext(place);
-                  })
 #endif
-      ;  // NOLINT
+          });
+
   py::class_<paddle::platform::GPUPlace>(m, "GPUPlace").def(py::init<int>());
 
   py::class_<paddle::platform::CPUPlace>(m, "CPUPlace").def(py::init<>());
@@ -198,5 +211,7 @@ All parameter, weight, gradient are variables in Paddle.
 
   m.def("unique_integer", UniqueIntegerGenerator);
 
+  m.def("is_compile_gpu", IsCompileGPU);
+
   return m.ptr();
 }

python/paddle/v2/framework/tests/op_test_util.py

@@ -25,9 +25,15 @@ class OpTestMeta(type):
             self.assertIsNotNone(func)
 
             scope = core.Scope(None)
-            place = core.CPUPlace()
+
             kwargs = dict()
 
+            places = []
+            places.append(core.CPUPlace())
+            if core.is_compile_gpu():
+                places.append(core.GPUPlace(0))
+
+            for place in places:
                 for in_name in func.all_input_args:
                     if hasattr(self, in_name):
                         kwargs[in_name] = in_name
@@ -51,7 +57,7 @@ class OpTestMeta(type):
 
                 op.infer_shape(scope)
 
-            ctx = core.DeviceContext.cpu_context()
+                ctx = core.DeviceContext.create(place)
                 op.run(scope, ctx)
 
                 for out_name in func.all_output_args:

python/paddle/v2/framework/tests/test_fc_op.py

@@ -33,7 +33,7 @@ class TestFc(unittest.TestCase):
         op.infer_shape(scope)
         self.assertEqual([1000, 100], tensor.shape())
 
-        ctx = core.DeviceContext.cpu_context()
+        ctx = core.DeviceContext.create(place)
 
         op.run(scope, ctx)