From 2a837d7292e13d423853ac34d08d33fdde8df307 Mon Sep 17 00:00:00 2001 From: Brett Tiplitz Date: Tue, 27 Nov 2018 17:04:05 -0500 Subject: [PATCH 1/2] windows cuda build also needs stdint --- src/cudamatrix/cu-matrixdim.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cudamatrix/cu-matrixdim.h b/src/cudamatrix/cu-matrixdim.h index dab7bd40eb2..14b7d56590b 100644 --- a/src/cudamatrix/cu-matrixdim.h +++ b/src/cudamatrix/cu-matrixdim.h @@ -26,12 +26,12 @@ /* * Typedefs needed for ANSI-C interface of CUDA wrappers */ +#include #ifdef _MSC_VER typedef unsigned __int32 uint32_cuda; typedef __int32 int32_cuda; typedef __int32 MatrixIndexT_cuda; // you'd have to change this if you changed MatrixIndexT from int32. #else - #include typedef uint32_t uint32_cuda; typedef int32_t int32_cuda; typedef int32_t MatrixIndexT_cuda; // you'd have to change this if you changed MatrixIndexT from int32. From 058a5b96d3befbacf0e6766bb0a3ee80f2916c61 Mon Sep 17 00:00:00 2001 From: Brett Tiplitz Date: Tue, 27 Nov 2018 17:50:00 -0500 Subject: [PATCH 2/2] stdint available in C++11 --- src/cudamatrix/cu-matrixdim.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/cudamatrix/cu-matrixdim.h b/src/cudamatrix/cu-matrixdim.h index 14b7d56590b..74912dad6e3 100644 --- a/src/cudamatrix/cu-matrixdim.h +++ b/src/cudamatrix/cu-matrixdim.h @@ -26,16 +26,10 @@ /* * Typedefs needed for ANSI-C interface of CUDA wrappers */ -#include -#ifdef _MSC_VER - typedef unsigned __int32 uint32_cuda; - typedef __int32 int32_cuda; - typedef __int32 MatrixIndexT_cuda; // you'd have to change this if you changed MatrixIndexT from int32. -#else - typedef uint32_t uint32_cuda; - typedef int32_t int32_cuda; - typedef int32_t MatrixIndexT_cuda; // you'd have to change this if you changed MatrixIndexT from int32. -#endif +#include +typedef uint32_t uint32_cuda; +typedef int32_t int32_cuda; +typedef int32_t MatrixIndexT_cuda; // you'd have to change this if you changed MatrixIndexT from int32. template struct MatrixElement {