[MXNET-860] Update to modern nullptr usage

apache · Aug 25, 2018 · 1f8aeb8 · 1f8aeb8
1 parent 4c48a97
commit 1f8aeb8
Show file tree

Hide file tree

Showing 34 changed files with 35 additions and 35 deletions.
diff --git a/src/c_api/c_api_executor.cc b/src/c_api/c_api_executor.cc
@@ -130,7 +130,7 @@ int MXExecutorBindX(SymbolHandle symbol_handle,
                           num_map_keys, map_keys, map_dev_types, map_dev_ids,
                           len, in_args, arg_grad_store, grad_req_type,
                           aux_states_len, aux_states,
-                          NULL, out);
+                          nullptr, out);
 }
 
 int MXExecutorBindEX(SymbolHandle symbol_handle,

diff --git a/src/c_api/c_predict_api.cc b/src/c_api/c_predict_api.cc
@@ -87,7 +87,7 @@ int MXPredCreate(const char* symbol_json_str,
       input_shape_indptr,
       input_shape_data,
       0,
-      NULL,
+      nullptr,
       out);
 }
 namespace mxnet {

diff --git a/src/operator/bilinear_sampler.cc b/src/operator/bilinear_sampler.cc
@@ -152,7 +152,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<cpu>(BilinearSamplerParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new BilinearSamplerOp<cpu, DType>(param);
   })

diff --git a/src/operator/contrib/count_sketch.cc b/src/operator/contrib/count_sketch.cc
@@ -30,7 +30,7 @@ namespace op {
 template<>
 Operator *CreateOp<cpu>(CountSketchParam param, int dtype) {
     LOG(FATAL) << "CountSketch is only available for GPU.";
-    return NULL;
+    return nullptr;
 }
 Operator *CountSketchProp::CreateOperatorEx(Context ctx, std::vector<TShape> *in_shape,
                                             std::vector<int> *in_type) const {

diff --git a/src/operator/contrib/deformable_convolution.cc b/src/operator/contrib/deformable_convolution.cc
@@ -36,7 +36,7 @@ Operator* CreateOp<cpu>(DeformableConvolutionParam param, int dtype,
                         std::vector<TShape> *in_shape,
                         std::vector<TShape> *out_shape,
                         Context ctx) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new DeformableConvolutionOp<cpu, DType>(param);
   })

diff --git a/src/operator/contrib/deformable_psroi_pooling.cc b/src/operator/contrib/deformable_psroi_pooling.cc
@@ -81,7 +81,7 @@ namespace op {
 
   template<>
   Operator *CreateOp<cpu>(DeformablePSROIPoolingParam param, int dtype) {
-    Operator* op = NULL;
+    Operator* op = nullptr;
     MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
       op = new DeformablePSROIPoolingOp<cpu, DType>(param);
     });

diff --git a/src/operator/contrib/deformable_psroi_pooling.cu b/src/operator/contrib/deformable_psroi_pooling.cu
@@ -423,7 +423,7 @@ namespace op {
 
   template<>
   Operator* CreateOp<gpu>(DeformablePSROIPoolingParam param, int dtype) {
-    Operator* op = NULL;
+    Operator* op = nullptr;
     MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
       op = new DeformablePSROIPoolingOp<gpu, DType>(param);
     });

diff --git a/src/operator/contrib/fft.cc b/src/operator/contrib/fft.cc
@@ -30,7 +30,7 @@ namespace op {
 template<>
 Operator *CreateOp<cpu>(FFTParam param, int dtype) {
   LOG(FATAL) << "fft is only available for GPU.";
-  return NULL;
+  return nullptr;
 }
 
 Operator *FFTProp::CreateOperatorEx(Context ctx, std::vector<TShape> *in_shape,

diff --git a/src/operator/contrib/ifft.cc b/src/operator/contrib/ifft.cc
@@ -31,7 +31,7 @@ namespace op {
 template<>
 Operator *CreateOp<cpu>(IFFTParam param, int dtype) {
   LOG(FATAL) << "ifft is only available for GPU.";
-  return NULL;
+  return nullptr;
 }
 
 Operator *IFFTProp::CreateOperatorEx(Context ctx, std::vector<TShape> *in_shape,

diff --git a/src/operator/contrib/multibox_detection.cc b/src/operator/contrib/multibox_detection.cc
@@ -198,7 +198,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(MultiBoxDetectionParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new MultiBoxDetectionOp<cpu, DType>(param);
   });

diff --git a/src/operator/contrib/multibox_prior.cc b/src/operator/contrib/multibox_prior.cc
@@ -76,7 +76,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<cpu>(MultiBoxPriorParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new MultiBoxPriorOp<cpu, DType>(param);
   });

diff --git a/src/operator/contrib/multibox_target.cc b/src/operator/contrib/multibox_target.cc
@@ -284,7 +284,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(MultiBoxTargetParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new MultiBoxTargetOp<cpu, DType>(param);
   });

diff --git a/src/operator/contrib/psroi_pooling.cc b/src/operator/contrib/psroi_pooling.cc
@@ -66,7 +66,7 @@ namespace op {
 
 template<>
 Operator *CreateOp<cpu>(PSROIPoolingParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new PSROIPoolingOp<cpu, DType>(param);
   });

diff --git a/src/operator/contrib/psroi_pooling.cu b/src/operator/contrib/psroi_pooling.cu
@@ -268,7 +268,7 @@ namespace op {
 
 template<>
 Operator* CreateOp<gpu>(PSROIPoolingParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new PSROIPoolingOp<gpu, DType>(param);
   });

diff --git a/src/operator/convolution_v1.cc b/src/operator/convolution_v1.cc
@@ -38,7 +38,7 @@ Operator* CreateOp<cpu>(ConvolutionV1Param param, int dtype,
                         std::vector<TShape> *in_shape,
                         std::vector<TShape> *out_shape,
                         Context ctx) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new ConvolutionV1Op<cpu, DType>(param);
   })

diff --git a/src/operator/correlation.cc b/src/operator/correlation.cc
@@ -149,7 +149,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(CorrelationParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new CorrelationOp<cpu, DType>(param);
   });

diff --git a/src/operator/correlation.cu b/src/operator/correlation.cu
@@ -622,7 +622,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<gpu>(CorrelationParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new CorrelationOp<gpu, DType>(param);
   });

diff --git a/src/operator/grid_generator.cc b/src/operator/grid_generator.cc
@@ -30,7 +30,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<cpu>(GridGeneratorParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   if (dtype == mshadow::kFloat32) {
     op = new GridGeneratorOp<cpu, float>(param);
   } else {

diff --git a/src/operator/l2_normalization.cc b/src/operator/l2_normalization.cc
@@ -27,7 +27,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<cpu>(L2NormalizationParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new L2NormalizationOp<cpu, DType>(param);
   });

diff --git a/src/operator/l2_normalization.cu b/src/operator/l2_normalization.cu
@@ -27,7 +27,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<gpu>(L2NormalizationParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new L2NormalizationOp<gpu, DType>(param);
   });

diff --git a/src/operator/leaky_relu.cc b/src/operator/leaky_relu.cc
@@ -31,7 +31,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(LeakyReLUParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new LeakyReLUOp<cpu, DType>(param);
   });

diff --git a/src/operator/leaky_relu.cu b/src/operator/leaky_relu.cu
@@ -30,7 +30,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<gpu>(LeakyReLUParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new LeakyReLUOp<gpu, DType>(param);
   });

diff --git a/src/operator/make_loss.cc b/src/operator/make_loss.cc
@@ -28,7 +28,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(MakeLossParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new MakeLossOp<cpu, DType>(param);
   });

diff --git a/src/operator/pooling_v1.cc b/src/operator/pooling_v1.cc
@@ -30,7 +30,7 @@ namespace op {
 
 template<>
 Operator *CreateOp<cpu>(PoolingV1Param param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     switch (param.pool_type) {
       case pool_v1_enum::kMaxPooling:
@@ -44,7 +44,7 @@ Operator *CreateOp<cpu>(PoolingV1Param param, int dtype) {
         break;
       default:
         LOG(FATAL) << "unknown pooling type";
-        return NULL;
+        return nullptr;
     }
   })
 

diff --git a/src/operator/rnn.cc b/src/operator/rnn.cc
@@ -29,7 +29,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(RNNParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new RNNOp<DType>(param);
   });

diff --git a/src/operator/roi_pooling.cc b/src/operator/roi_pooling.cc
@@ -234,7 +234,7 @@ namespace op {
 
 template<>
 Operator *CreateOp<cpu>(ROIPoolingParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new ROIPoolingOp<cpu, DType>(param);
   });

diff --git a/src/operator/roi_pooling.cu b/src/operator/roi_pooling.cu
@@ -264,7 +264,7 @@ namespace op {
 
 template<>
 Operator* CreateOp<gpu>(ROIPoolingParam param, int dtype) {
-  Operator* op = NULL;
+  Operator* op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new ROIPoolingOp<gpu, DType>(param);
   });

diff --git a/src/operator/sequence_last.cc b/src/operator/sequence_last.cc
@@ -29,7 +29,7 @@ namespace mxnet {
 namespace op {
 template <>
 Operator *CreateOp<cpu>(SequenceLastParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_TYPE_SWITCH(dtype, DType,
                            { op = new SequenceLastOp<cpu, DType>(param); })
   return op;

diff --git a/src/operator/sequence_mask.cc b/src/operator/sequence_mask.cc
@@ -29,7 +29,7 @@ namespace mxnet {
 namespace op {
 template <>
 Operator *CreateOp<cpu>(SequenceMaskParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_TYPE_SWITCH(dtype, DType,
                            { op = new SequenceMaskOp<cpu, DType>(param); })
   return op;

diff --git a/src/operator/sequence_reverse.cc b/src/operator/sequence_reverse.cc
@@ -29,7 +29,7 @@ namespace mxnet {
 namespace op {
 template <>
 Operator *CreateOp<cpu>(SequenceReverseParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_TYPE_SWITCH(dtype, DType,
                            { op = new SequenceReverseOp<cpu, DType>(param); })
   return op;

diff --git a/src/operator/softmax_output.cc b/src/operator/softmax_output.cc
@@ -29,7 +29,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(SoftmaxOutputParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new SoftmaxOutputOp<cpu, DType>(param);
   })

diff --git a/src/operator/spatial_transformer.cc b/src/operator/spatial_transformer.cc
@@ -153,7 +153,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator* CreateOp<cpu>(SpatialTransformerParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new SpatialTransformerOp<cpu, DType>(param);
   })

diff --git a/src/operator/svm_output.cc b/src/operator/svm_output.cc
@@ -71,7 +71,7 @@ namespace mxnet {
 namespace op {
 template<>
 Operator *CreateOp<cpu>(SVMOutputParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
     op = new SVMOutputOp<cpu, DType>(param);
   })

diff --git a/src/operator/swapaxis.cc b/src/operator/swapaxis.cc
@@ -31,7 +31,7 @@ namespace op {
 
 template<>
 Operator* CreateOp<cpu>(SwapAxisParam param, int dtype) {
-  Operator *op = NULL;
+  Operator *op = nullptr;
   MSHADOW_TYPE_SWITCH(dtype, DType, {
     op = new SwapAxisOp<cpu, DType>(param);
   });