From 817fd9ebf1717b12c34af0f91903926eea78038e Mon Sep 17 00:00:00 2001 From: Iurii Zdebskyi Date: Mon, 11 Mar 2019 10:11:09 -0700 Subject: [PATCH] Removed dead code from THTensorMath.h (#17769) Summary: This PR removes dead code from THTensorMath.h I found these unused methods while working on a PR where i plan to move **fill** and **zero** methods from TH/THC to Aten. Pull Request resolved: https://github.com/pytorch/pytorch/pull/17769 Differential Revision: D14372732 Pulled By: izdeby fbshipit-source-id: 94fd3b52c691ebc89d2bdc8905452e7498038bf5 --- aten/src/TH/generic/THTensorMath.h | 5 --- aten/src/TH/generic/THTensorMoreMath.cpp | 65 ----------------------------- aten/src/THC/generic/THCTensorMath.h | 3 -- aten/src/THC/generic/THCTensorMathReduce.cu | 47 --------------------- aten/src/THC/generic/THCTensorMathReduce.h | 3 -- 5 files changed, 123 deletions(-) diff --git a/aten/src/TH/generic/THTensorMath.h b/aten/src/TH/generic/THTensorMath.h index 82aa53b..3c5dcef 100644 --- a/aten/src/TH/generic/THTensorMath.h +++ b/aten/src/TH/generic/THTensorMath.h @@ -91,11 +91,7 @@ TH_API void THTensor_(cmin)(THTensor *r, THTensor *t, THTensor *src); TH_API void THTensor_(cmaxValue)(THTensor *r, THTensor *t, scalar_t value); TH_API void THTensor_(cminValue)(THTensor *r, THTensor *t, scalar_t value); -TH_API void THTensor_(zerosLike)(THTensor *r_, THTensor *input); -TH_API void THTensor_(onesLike)(THTensor *r_, THTensor *input); TH_API void THTensor_(diag)(THTensor *r_, THTensor *t, int k); -TH_API void THTensor_(eye)(THTensor *r_, int64_t n, int64_t m); -TH_API void THTensor_(randperm)(THTensor *r_, THGenerator *_generator, int64_t n); TH_API void THTensor_(sort)(THTensor *rt_, THLongTensor *ri_, THTensor *t, int dimension, int descendingOrder); TH_API void THTensor_(topk)(THTensor *rt_, THLongTensor *ri_, THTensor *t, int64_t k, int dim, int dir, int sorted); @@ -170,7 +166,6 @@ TH_API void THTensor_(round)(THTensor *r_, THTensor *t); TH_API void THTensor_(trunc)(THTensor *r_, THTensor *t); TH_API void THTensor_(frac)(THTensor *r_, THTensor *t); -TH_API void THTensor_(mean)(THTensor *r_, THTensor *t, int dimension, int keepdim); TH_API void THTensor_(std)(THTensor *r_, THTensor *t, int dimension, int biased, int keepdim); TH_API void THTensor_(var)(THTensor *r_, THTensor *t, int dimension, int biased, int keepdim); TH_API void THTensor_(norm)(THTensor *r_, THTensor *t, scalar_t value, int dimension, int keepdim); diff --git a/aten/src/TH/generic/THTensorMoreMath.cpp b/aten/src/TH/generic/THTensorMoreMath.cpp index 374a0b1..ae33fa0 100644 --- a/aten/src/TH/generic/THTensorMoreMath.cpp +++ b/aten/src/TH/generic/THTensorMoreMath.cpp @@ -538,18 +538,6 @@ void THTensor_(cminValue)(THTensor *r, THTensor *t, scalar_t value) { *r_data = *t_data > value ? value : *t_data;); // this order propagates NaN } -void THTensor_(zerosLike)(THTensor *r_, THTensor *input) -{ - THTensor_(resizeAs)(r_, input); - THTensor_(zero)(r_); -} - -void THTensor_(onesLike)(THTensor *r_, THTensor *input) -{ - THTensor_(resizeAs)(r_, input); - THTensor_(fill)(r_, 1); -} - void THTensor_(diag)(THTensor *r_, THTensor *t, int k) { THArgCheck(THTensor_(nDimensionLegacyNoScalars)(t) == 1 || THTensor_(nDimensionLegacyNoScalars)(t) == 2, 1, "matrix or a vector expected"); @@ -599,50 +587,6 @@ void THTensor_(diag)(THTensor *r_, THTensor *t, int k) } } -void THTensor_(eye)(THTensor *r_, int64_t n, int64_t m) -{ - scalar_t *r__data; - int64_t i, sz; - - THArgCheck(n > 0, 1, "invalid argument"); - - if(m <= 0) - m = n; - - THTensor_(resize2d)(r_, n, m); - THTensor_(zero)(r_); - - i = 0; - r__data = r_->data(); - sz = THMin(THTensor_(size)(r_, 0), THTensor_(size)(r_, 1)); - for(i = 0; i < sz; i++) - r__data[i*(r_->stride(0)+r_->stride(1))] = 1; -} - -void THTensor_(randperm)(THTensor *r_, THGenerator *_generator, int64_t n) -{ - std::lock_guard lock(_generator->mutex); - scalar_t *r__data; - int64_t r__stride_0; - int64_t i; - - THArgCheck(n > 0, 1, "must be strictly positive"); - - THTensor_(resize1d)(r_, n); - r__data = r_->data(); - r__stride_0 = THTensor_(stride)(r_,0); - - for(i = 0; i < n; i++) - r__data[i*r__stride_0] = (scalar_t)(i); - - for(i = 0; i < n-1; i++) - { - int64_t z = THRandom_random(_generator) % (n-i); - scalar_t sav = r__data[i*r__stride_0]; - r__data[i*r__stride_0] = r__data[(z+i)*r__stride_0]; - r__data[(z+i)*r__stride_0] = sav; - } -} /* I cut and pasted (slightly adapted) the quicksort code from Sedgewick's 1978 "Implementing Quicksort Programs" article @@ -1469,15 +1413,6 @@ void THTensor_(polygamma)(THTensor *r_, int64_t n, THTensor *t) { } } -void THTensor_(mean)(THTensor *r_, THTensor *t, int dimension, int keepdim) -{ - THArgCheck(dimension >= 0 && dimension < THTensor_(nDimensionLegacyAll)(t), 2, "invalid dimension %d", - dimension); - - THTensor_(sum)(r_, t, dimension, keepdim); - THTensor_(div)(r_, r_, THTensor_sizeLegacyNoScalars(t, dimension)); -} - void THTensor_(std)(THTensor *r_, THTensor *t, int dimension, int biased, int keepdim) { THArgCheck(dimension >= 0 && dimension < THTensor_(nDimensionLegacyAll)(t), 3, "invalid dimension %d", diff --git a/aten/src/THC/generic/THCTensorMath.h b/aten/src/THC/generic/THCTensorMath.h index 8ac8ac4..fd1d420 100644 --- a/aten/src/THC/generic/THCTensorMath.h +++ b/aten/src/THC/generic/THCTensorMath.h @@ -5,8 +5,6 @@ THC_API void THCTensor_(fill)(THCState *state, THCTensor *self, scalar_t value); THC_API void THCTensor_(zero)(THCState *state, THCTensor *self); -THC_API void THCTensor_(zerosLike)(THCState *state, THCTensor *r_, THCTensor* input); -THC_API void THCTensor_(onesLike)(THCState *state, THCTensor *r_, THCTensor* input); THC_API ptrdiff_t THCTensor_(numel)(THCState *state, THCTensor *t); THC_API void THCTensor_(cat)(THCState *state, THCTensor *result, THCTensor *ta, THCTensor *tb, int dimension); THC_API void THCTensor_(catArray)(THCState *state, THCTensor *result, THCTensor **inputs, int numInputs, int dimension); @@ -14,7 +12,6 @@ THC_API void THCTensor_(nonzero)(THCState* state, THCudaLongTensor *tensor, THCT THC_API void THCTensor_(triu)(THCState *state, THCTensor *self, THCTensor *src, int64_t k); THC_API void THCTensor_(diag)(THCState *state, THCTensor *self, THCTensor *src, int64_t k); -THC_API void THCTensor_(eye)(THCState *state, THCTensor *self, int64_t n, int64_t k); THC_API accreal THCTensor_(trace)(THCState *state, THCTensor *self); diff --git a/aten/src/THC/generic/THCTensorMathReduce.cu b/aten/src/THC/generic/THCTensorMathReduce.cu index a817516..7dbfacc 100644 --- a/aten/src/THC/generic/THCTensorMathReduce.cu +++ b/aten/src/THC/generic/THCTensorMathReduce.cu @@ -2,21 +2,6 @@ #define THC_GENERIC_FILE "THC/generic/THCTensorMathReduce.cu" #else -void THCTensor_(sum)(THCState* state, THCTensor *self, THCTensor *src, int dimension, int keepdim) { - THCAssertSameGPU(THCTensor_(checkGPU)(state, 2, self, src)); - if (!THC_reduceDim(state, self, src, - thrust::identity{}, - ReduceAdd{}, - thrust::identity{}, - scalar_cast(0), - dimension, - keepdim)) { - THArgCheck(false, 2, CUTORCH_DIM_WARNING); - } - - THCudaCheck(cudaGetLastError()); -} - void THCTensor_(prod)(THCState* state, THCTensor *self, THCTensor *src, int dimension, int keepdim) { THCAssertSameGPU(THCTensor_(checkGPU)(state, 2, self, src)); if (!THC_reduceDim(state, self, src, @@ -32,23 +17,6 @@ void THCTensor_(prod)(THCState* state, THCTensor *self, THCTensor *src, int dime THCudaCheck(cudaGetLastError()); } -void THCTensor_(mean)(THCState *state, THCTensor *self, THCTensor *src, int dim, int keepdim) -{ - THCAssertSameGPU(THCTensor_(checkGPU)(state, 2, self, src)); - const accreal size = scalar_cast(THCTensor_(size)(state, src, dim)); - if (!THC_reduceDim(state, self, src, - thrust::identity{}, - ReduceAdd{}, - ReduceDivide{size}, - scalar_cast(0), - dim, - keepdim)) { - THArgCheck(false, 2, CUTORCH_DIM_WARNING); - } - - THCudaCheck(cudaGetLastError()); -} - #if defined(THC_REAL_IS_FLOAT) || defined(THC_REAL_IS_DOUBLE) || defined(THC_REAL_IS_HALF) void THCTensor_(renorm)(THCState *state, THCTensor* self, THCTensor* src, scalar_t value, int dimension, scalar_t maxnorm) @@ -326,21 +294,6 @@ accreal THCTensor_(sumall)(THCState *state, THCTensor *self) { return val; } -accreal THCTensor_(prodall)(THCState *state, THCTensor *self) { - THCAssertSameGPU(THCTensor_(checkGPU)(state, 1, self)); - accreal val; - if (!THC_reduceAll(state, self, - thrust::identity{}, - ReduceMultiply{}, - scalar_cast(1), - &val, 0)) { - THArgCheck(false, 1, CUTORCH_DIM_WARNING); - } - - THCudaCheck(cudaGetLastError()); - return val; -} - accreal THCTensor_(meanall)(THCState *state, THCTensor *self) { THCAssertSameGPU(THCTensor_(checkGPU)(state, 1, self)); diff --git a/aten/src/THC/generic/THCTensorMathReduce.h b/aten/src/THC/generic/THCTensorMathReduce.h index 2dba99c..0bb6c31 100644 --- a/aten/src/THC/generic/THCTensorMathReduce.h +++ b/aten/src/THC/generic/THCTensorMathReduce.h @@ -15,12 +15,9 @@ THC_API accreal THCTensor_(varall)(THCState *state, THCTensor *self, int biased) #endif -THC_API void THCTensor_(sum)(THCState *state, THCTensor *self, THCTensor *src, int dim, int keepdim); THC_API void THCTensor_(prod)(THCState *state, THCTensor *self, THCTensor *src, int dim, int keepdim); -THC_API void THCTensor_(mean)(THCState *state, THCTensor *self, THCTensor *src, int dim, int keepdim); THC_API accreal THCTensor_(sumall)(THCState *state, THCTensor *self); -THC_API accreal THCTensor_(prodall)(THCState *state, THCTensor *self); THC_API accreal THCTensor_(meanall)(THCState *state, THCTensor *self); THC_API void THCTensor_(min)(THCState *state, -- 2.7.4