Use proper isnan check

bddppq · facebook-github-bot · commit 828a6a3b3943 · 2019-03-31T02:08:11.000-07:00
Summary: Pull Request resolved: #18663 Differential Revision: D14699385 Pulled By: bddppq fbshipit-source-id: 596ad3371e7704802591e49f7e1c55dc6cd2896f
diff --git a/aten/src/TH/generic/THTensorMoreMath.cpp b/aten/src/TH/generic/THTensorMoreMath.cpp
@@ -544,7 +544,7 @@ void THTensor_(diag)(THTensor *r_, THTensor *t, int k)
 /* Emulate NumPy behavior of putting NaNs
  * at the end of an ascending list. */
 #define GT_OR_NAN(x, y) \
-  ((x != x && y == y) || (x > y))
+  ((th_isnan(x) && !(th_isnan(y))) || (x > y))
 
 static void THTensor_(quicksortascend)(scalar_t *arr, int64_t *idx, int64_t elements, int64_t stride)
 {

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ void THTensor_(diag)(THTensor r_, THTensor t, int k)`
`544`	`544`	`/* Emulate NumPy behavior of putting NaNs`
`545`	`545`	`* at the end of an ascending list. */`
`546`	`546`	`#define GT_OR_NAN(x, y) \`
`547`		`- ((x != x && y == y) \|\| (x > y))`
	`547`	`+ ((th_isnan(x) && !(th_isnan(y))) \|\| (x > y))`
`548`	`548`
`549`	`549`	`static void THTensor_(quicksortascend)(scalar_t arr, int64_t idx, int64_t elements, int64_t stride)`
`550`	`550`	`{`