Merge pull request #169 from NVIDIA/intlist-intarrayref

Rename IntList to IntArrayRef

Merge pull request #169 from NVIDIA/intlist-intarrayref
Rename IntList to IntArrayRef
6e5d9099 · mcarilli · GitHub · 823b30cf · 0f5e3fe0 · 6e5d9099
Unverified Commit 6e5d9099 authored Mar 21, 2019 by mcarilli Committed by GitHub Mar 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 48 additions and 0 deletions

csrc/layer_norm_cuda.cpp csrc/layer_norm_cuda.cpp +40 -0

csrc/layer_norm_cuda_kernel.cu csrc/layer_norm_cuda_kernel.cu +8 -0

No files found.
--- a/csrc/layer_norm_cuda.cpp
+++ b/csrc/layer_norm_cuda.cpp
@@ -5,7 +5,11 @@
 namespace {
 void compute_n1_n2(
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    int& n1,
    int& n2)
 {
@@ -22,7 +26,11 @@ void compute_n1_n2(
 }

 void check_args(
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor gamma,
    at::Tensor beta
    )
@@ -33,7 +41,11 @@ void check_args(

 void check_args(
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    int& n1,
    int& n2
    )
@@ -69,7 +81,11 @@ void check_args(

 void check_args(
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor gamma,
    at::Tensor beta,
    int& n1,
@@ -88,7 +104,11 @@ void cuda_layer_norm(
    at::Tensor* input,
    int n1,
    int n2,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor* gamma,
    at::Tensor* beta,
    double epsilon);
@@ -99,7 +119,11 @@ void cuda_layer_norm(

 std::vector<at::Tensor> layer_norm(
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    double epsilon) {
  CHECK_INPUT(input);
  int n1,n2;
@@ -113,7 +137,11 @@ std::vector<at::Tensor> layer_norm(
 }
 std::vector<at::Tensor> layer_norm_affine(
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor gamma,
    at::Tensor beta,
    double epsilon) {
@@ -137,7 +165,11 @@ void cuda_layer_norm_gradient(
    at::Tensor* input,
    int n1,
    int n2,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor* gamma,
    at::Tensor* beta,
    double epsilon,
@@ -151,7 +183,11 @@ at::Tensor layer_norm_gradient(
    at::Tensor mean,
    at::Tensor invvar,
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    double epsilon) {
  CHECK_INPUT(dout);
  CHECK_INPUT(mean);
@@ -170,7 +206,11 @@ std::vector<at::Tensor> layer_norm_gradient_affine(
    at::Tensor mean,
    at::Tensor invvar,
    at::Tensor input,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor gamma,
    at::Tensor beta,
    double epsilon) {

--- a/csrc/layer_norm_cuda_kernel.cu
+++ b/csrc/layer_norm_cuda_kernel.cu
@@ -672,7 +672,11 @@ void cuda_layer_norm(
    at::Tensor* input,
    int n1,
    int n2,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor* gamma,
    at::Tensor* beta,
    double epsilon)
@@ -767,7 +771,11 @@ void cuda_layer_norm_gradient(
    at::Tensor* input,
    int n1,
    int n2,
+    #ifdef VERSION_GE_1_1
+    at::IntArrayRef normalized_shape,
+    #else
    at::IntList normalized_shape,
+    #endif
    at::Tensor* gamma,
    at::Tensor* beta,
    double epsilon,