Merge pull request #405 from apaszke/bool

Use bool for sizeAverage in SoftMarginCriterion
torch · Dec 27, 2016 · 4173b22 · 4173b22
2 parents d3d21f5 + 0826d63
commit 4173b22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/THCUNN/generic/SoftMarginCriterion.cu b/lib/THCUNN/generic/SoftMarginCriterion.cu
@@ -7,7 +7,7 @@ void THNN_(SoftMarginCriterion_updateOutput)(
            THCTensor *input,
            THCTensor *target,
            THCTensor *output,
-           int sizeAverage)
+           bool sizeAverage)
 {
   THCUNN_check_nElement(state, input, target);
   THCUNN_check_dim_size(state, output, 1, 0, 1);
@@ -37,7 +37,7 @@ void THNN_(SoftMarginCriterion_updateGradInput)(
            THCTensor *input,
            THCTensor *target,
            THCTensor *gradInput,
-           int sizeAverage)
+           bool sizeAverage)
 {
   THCUNN_check_nElement(state, input, target);
   THCUNN_assertSameGPU(state, 3, input, target, gradInput);

diff --git a/lib/THCUNN/generic/THCUNN.h b/lib/THCUNN/generic/THCUNN.h
@@ -805,14 +805,14 @@ TH_API void THNN_(SoftMarginCriterion_updateOutput)(
                   THCTensor *input,
                   THCTensor *target,
                   THCTensor *output,
-                  int sizeAverage);
+                  bool sizeAverage);
 
 TH_API void THNN_(SoftMarginCriterion_updateGradInput)(
                   THCState *state,
                   THCTensor *input,
                   THCTensor *target,
                   THCTensor *gradInput,
-                  int sizeAverage);
+                  bool sizeAverage);
 
 TH_API void THNN_(SoftMax_updateOutput)(
                   THCState *state,