fix build errors due to new gcc compiler (5.x from ubuntu 16.4.1)
This commit is contained in:
Родитель
7963e756d6
Коммит
c5f25404ea
|
@ -347,7 +347,7 @@ CPUSparseMatrix<ElemType>& CPUSparseMatrix<ElemType>::DoGatherColumnsOf(ElemType
|
|||
for (long j = 0; j < numCols; j++)
|
||||
{
|
||||
auto jInF = idx(0, j); // this is the column we need to get
|
||||
if (::isnan(jInF) || (jInF < 0)) // negative index means gap
|
||||
if (std::isnan(jInF) || (jInF < 0)) // negative index means gap
|
||||
continue;
|
||||
size_t jIn = (size_t)jInF;
|
||||
|
||||
|
@ -364,7 +364,7 @@ CPUSparseMatrix<ElemType>& CPUSparseMatrix<ElemType>::DoGatherColumnsOf(ElemType
|
|||
for (long j = 0; j < numCols; j++)
|
||||
{
|
||||
auto jInF = idx(0, j); // this is the column we need to get
|
||||
if (::isnan(jInF) || (jInF < 0)) // negative index means gap
|
||||
if (std::isnan(jInF) || (jInF < 0)) // negative index means gap
|
||||
continue;
|
||||
size_t jIn = (size_t)jInF;
|
||||
|
||||
|
@ -411,7 +411,7 @@ CPUSparseMatrix<ElemType>& CPUSparseMatrix<ElemType>::DoScatterColumnsOf(ElemTyp
|
|||
for (long j = 0; j < numColsToWrite; j++)
|
||||
{
|
||||
auto jOutF = idx(0, j); // this is the column we need to write to
|
||||
if (::isnan(jOutF) || (jOutF < 0)) // negative index means gap
|
||||
if (std::isnan(jOutF) || (jOutF < 0)) // negative index means gap
|
||||
continue;
|
||||
size_t jOut = (size_t)jOutF;
|
||||
columnElementCounts[jOut] = a.SecondaryIndexLocation()[j + 1] - a.SecondaryIndexLocation()[j];
|
||||
|
@ -426,7 +426,7 @@ CPUSparseMatrix<ElemType>& CPUSparseMatrix<ElemType>::DoScatterColumnsOf(ElemTyp
|
|||
for (long j = 0; j < numColsToWrite; j++)
|
||||
{
|
||||
auto jOutF = idx(0, j); // this is the column we need to write to
|
||||
if (::isnan(jOutF) || (jOutF < 0)) // negative index means gap
|
||||
if (std::isnan(jOutF) || (jOutF < 0)) // negative index means gap
|
||||
continue;
|
||||
size_t jOut = (size_t)jOutF;
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ inline size_t GetSizeByType(ElementType type)
|
|||
case ElementType::tdouble:
|
||||
return sizeof(double);
|
||||
default:
|
||||
RuntimeError("Unsupported type '%d'", type);
|
||||
RuntimeError("Unsupported type '%d'", (int)type);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче