Skip to content

windows cuda build failure #2880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 9 commits into from
Nov 28, 2018
Merged

windows cuda build failure #2880

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3da571a
Merge pull request #1 from kaldi-asr/master
btiplitz Aug 27, 2018
34fb754
Merge remote-tracking branch 'upstream/master'
Sep 5, 2018
be74a7a
Merge remote-tracking branch 'upstream/master'
Oct 24, 2018
b52f321
Merge remote-tracking branch 'remotes/upstream/master'
Nov 13, 2018
19f2e91
Merge remote-tracking branch 'remotes/upstream/master'
Nov 15, 2018
e4ebe75
Merge remote-tracking branch 'remotes/upstream/master'
Nov 27, 2018
2a837d7
windows cuda build also needs stdint
Nov 27, 2018
058a5b9
stdint available in C++11
Nov 27, 2018
7b04953
Merge branch 'master' into windows-cuda
btiplitz Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/cudamatrix/cu-matrixdim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,10 @@
/*
* Typedefs needed for ANSI-C interface of CUDA wrappers
*/
#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 <stdint.h>
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 <cstdint>
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<typename Real>
struct MatrixElement {
Expand Down