Skip to content

N
NiuTrans.Tensor
Commit cf149d57 by xiaotong
Options

correct unsafe code

parent 5546a260
正在显示 包含 22 行增加 和 11 行删除
source/network/Main.cpp
...@@ -193,7 +193,7 @@ void SumDimTest() ...@@ -193,7 +193,7 @@ void SumDimTest()
y.SetZeroAll(); y.SetZeroAll();
z.SetZeroAll(); z.SetZeroAll();
float * data = new float[x.unitNum]; DTYPE * data = new DTYPE[x.unitNum];
for(int i = 0; i < x.unitNum; i++) for(int i = 0; i < x.unitNum; i++)
data[i] = (DTYPE)i; data[i] = (DTYPE)i;
......
source/network/XBackwardShape.cpp
...@@ -154,6 +154,7 @@ void XShapeGrad::GradMerge(XTensor * node, bool isEfficent) ...@@ -154,6 +154,7 @@ void XShapeGrad::GradMerge(XTensor * node, bool isEfficent)
XNoder::MakeGrad(input); XNoder::MakeGrad(input);
int * dims = new int[input->order]; int * dims = new int[input->order];
memset(dims, 0, sizeof(int) * input->order);
for(int i = 0, j = 0; i < input->order; i++){ for(int i = 0, j = 0; i < input->order; i++){
if(i >= leadDim){ if(i >= leadDim){
dims[j++] = input->dimSize[i]; dims[j++] = input->dimSize[i];
......
source/sample/transformer/T2TTrainer.cpp
...@@ -1006,7 +1006,7 @@ void T2TTrainer::Update(T2TModel * model, const float lr) ...@@ -1006,7 +1006,7 @@ void T2TTrainer::Update(T2TModel * model, const float lr)
XTensor * para = (XTensor*)ws.Get(i); XTensor * para = (XTensor*)ws.Get(i);
XTensor * paraGrad = para->grad; XTensor * paraGrad = para->grad;
if (para == NULL || paraGrad == NULL) if (paraGrad == NULL)
continue; continue;
CheckNTErrors(para != NULL, "NULL parameter tensor!"); CheckNTErrors(para != NULL, "NULL parameter tensor!");
......
source/tensor/XDevice.cpp
...@@ -524,7 +524,7 @@ int XDevManager::GetDeviceIDs(char * devInfo, int * devIDs) ...@@ -524,7 +524,7 @@ int XDevManager::GetDeviceIDs(char * devInfo, int * devIDs)
for(int i = 0; i < terms->count; i++){ for(int i = 0; i < terms->count; i++){
int devC, devID; int devC, devID;
char dev[32]; char dev[32] = "";
char * curDevInfo = (char*)terms->GetItem(i); char * curDevInfo = (char*)terms->GetItem(i);
if(sscanf(curDevInfo, "%d:%s", &devC, dev) < 2){ if(sscanf(curDevInfo, "%d:%s", &devC, dev) < 2){
......
source/tensor/XTensor.cpp
...@@ -1278,7 +1278,7 @@ int XTensor::GetNonzeroSize() ...@@ -1278,7 +1278,7 @@ int XTensor::GetNonzeroSize()
if(dataType == DEFAULT_DTYPE){ if(dataType == DEFAULT_DTYPE){
int count = 0; int count = 0;
for(int i = 0; i < unitNum; i++){ for(int i = 0; i < unitNum; i++){
DTYPE value = *((DTYPE*)(char*)data + i * sizeof(DTYPE)); DTYPE value = *(DTYPE*)((char*)data + i * sizeof(DTYPE));
if(value == 0) if(value == 0)
count++; count++;
} }
...@@ -2261,6 +2261,8 @@ XTensor * NewTensor(const XTensor * a, bool isFilledData) ...@@ -2261,6 +2261,8 @@ XTensor * NewTensor(const XTensor * a, bool isFilledData)
CheckNTErrors((a != NULL), "Empty input!"); CheckNTErrors((a != NULL), "Empty input!");
memset(dims, 0, sizeof(int) * MAX_TENSOR_DIM_NUM);
if(a->order > 0) if(a->order > 0)
memcpy(dims, a->dimSize, sizeof(int) * a->order); memcpy(dims, a->dimSize, sizeof(int) * a->order);
......
source/tensor/core/getandset/SetData.cpp
...@@ -463,7 +463,7 @@ void _SetDataWithOffset(XTensor * tensor, MTYPE * offsets, DTYPE value, MTYPE nu ...@@ -463,7 +463,7 @@ void _SetDataWithOffset(XTensor * tensor, MTYPE * offsets, DTYPE value, MTYPE nu
#ifdef USE_CUDA #ifdef USE_CUDA
XMem * mem = tensor->mem; XMem * mem = tensor->mem;
MTYPE size = num * sizeof(MTYPE); MTYPE size = num * sizeof(MTYPE);
MTYPE * offsetsCuda = mem != NULL ? (MTYPE*)mem->AllocBuf(mem->devID, size) : (MTYPE*)XMemAlloc(mem->devID, size); MTYPE * offsetsCuda = mem != NULL ? (MTYPE*)mem->AllocBuf(mem->devID, size) : (MTYPE*)XMemAlloc(tensor->devID, size);
XMemCopy(offsetsCuda, tensor->devID, offsets, -1, num * sizeof(MTYPE)); XMemCopy(offsetsCuda, tensor->devID, offsets, -1, num * sizeof(MTYPE));
_CudaSetDataWithOffset(tensor, offsetsCuda, value, num); _CudaSetDataWithOffset(tensor, offsetsCuda, value, num);
...@@ -471,7 +471,7 @@ void _SetDataWithOffset(XTensor * tensor, MTYPE * offsets, DTYPE value, MTYPE nu ...@@ -471,7 +471,7 @@ void _SetDataWithOffset(XTensor * tensor, MTYPE * offsets, DTYPE value, MTYPE nu
if (mem != NULL) if (mem != NULL)
mem->ReleaseBuf(mem->devID, size); mem->ReleaseBuf(mem->devID, size);
else else
XMemFree(mem->devID, offsetsCuda); XMemFree(tensor->devID, offsetsCuda);
#else #else
ShowNTErrors("Please recompile the code with USE_CUDA"); ShowNTErrors("Please recompile the code with USE_CUDA");
#endif #endif
......
source/tensor/core/movement/CopyBlocks.cpp
...@@ -46,9 +46,9 @@ void _CopyBlocks(void * source, int blockSize, int blockNum, void * target, int ...@@ -46,9 +46,9 @@ void _CopyBlocks(void * source, int blockSize, int blockNum, void * target, int
#ifdef USE_CUDA #ifdef USE_CUDA
/* copy the index from host to device */ /* copy the index from host to device */
int * targetBlocksTMP = myMem != NULL ? int * targetBlocksTMP = myMem != NULL ?
(int*)myMem->AllocBuf(myMem->devID, blockNum * sizeof(int)): (int*)myMem->AllocBuf(devID, blockNum * sizeof(int)):
(int*)XMemAlloc(devID, blockNum * sizeof(int)); (int*)XMemAlloc(devID, blockNum * sizeof(int));
XMemCopy(targetBlocksTMP, myMem->devID, targetBlocks, -1, blockNum * sizeof(int)); XMemCopy(targetBlocksTMP, devID, targetBlocks, -1, blockNum * sizeof(int));
_CopyBlocksOnSite(source, blockSize, blockNum, target, targetBlocksTMP, devID); _CopyBlocksOnSite(source, blockSize, blockNum, target, targetBlocksTMP, devID);
......
source/tensor/core/movement/CopyBlocksInGrid.cpp
...@@ -59,7 +59,7 @@ void _CopyBlocksInGrid(void * source, int blockSize, int blockNum, int gridNum, ...@@ -59,7 +59,7 @@ void _CopyBlocksInGrid(void * source, int blockSize, int blockNum, int gridNum,
ShowNTErrors("Plesae specify USE_CUDA and recompile the code!"); ShowNTErrors("Plesae specify USE_CUDA and recompile the code!");
#endif #endif
} }
else { else if(myMem != NULL){
void * buf = XMemAlloc(myMem->devID, blockSize * blockNum * unitSize); void * buf = XMemAlloc(myMem->devID, blockSize * blockNum * unitSize);
for (int k = 0; k < gridNum; k++) { for (int k = 0; k < gridNum; k++) {
int offset = k * blockSize * blockNum; int offset = k * blockSize * blockNum;
...@@ -78,6 +78,9 @@ void _CopyBlocksInGrid(void * source, int blockSize, int blockNum, int gridNum, ...@@ -78,6 +78,9 @@ void _CopyBlocksInGrid(void * source, int blockSize, int blockNum, int gridNum,
} }
XMemFree(myMem->devID, buf); XMemFree(myMem->devID, buf);
} }
else {
ShowNTErrors("TODO!");
}
} }
} // namespace nts(NiuTrans.Tensor) } // namespace nts(NiuTrans.Tensor)
\ No newline at end of file
source/tensor/core/reduce/ReduceMax.cpp
...@@ -43,6 +43,8 @@ void _ReduceMax(const XTensor * input, XTensor * output, int dim) ...@@ -43,6 +43,8 @@ void _ReduceMax(const XTensor * input, XTensor * output, int dim)
CheckNTErrors((input->dataType == output->dataType), "Unmatched data types!"); CheckNTErrors((input->dataType == output->dataType), "Unmatched data types!");
int dimRDI = input->order - dim - 1; int dimRDI = input->order - dim - 1;
CheckNTErrors(dimRDI >= 0, "Wrong dimension!");
for(int i = 0; i < input->order; i++){ for(int i = 0; i < input->order; i++){
if(i < dimRDI){ if(i < dimRDI){
CheckNTErrors((input->dimSizeRDI[i] == output->dimSizeRDI[i]), CheckNTErrors((input->dimSizeRDI[i] == output->dimSizeRDI[i]),
......
source/tensor/core/reduce/ReduceSum.cpp
...@@ -51,6 +51,8 @@ void _ReduceSum(const XTensor * input, XTensor * output, int dim, const XTensor ...@@ -51,6 +51,8 @@ void _ReduceSum(const XTensor * input, XTensor * output, int dim, const XTensor
CheckNTErrors((shift == NULL || XTensor::IsSameShaped(output, shift)), "Incorrect shift tensor size!"); CheckNTErrors((shift == NULL || XTensor::IsSameShaped(output, shift)), "Incorrect shift tensor size!");
int dimRDI = input->order - dim - 1; int dimRDI = input->order - dim - 1;
CheckNTErrors(dimRDI >= 0, "Wrong dimension!");
for(int i = 0; i < input->order; i++){ for(int i = 0; i < input->order; i++){
if(i < dimRDI){ if(i < dimRDI){
CheckNTErrors((input->dimSizeRDI[i] == output->dimSizeRDI[i]), "Unmatched tensors!"); CheckNTErrors((input->dimSizeRDI[i] == output->dimSizeRDI[i]), "Unmatched tensors!");
......
source/tensor/core/shape/Split.cpp
...@@ -126,7 +126,7 @@ void _Split(const XTensor * s, XTensor * t, int whereToSplit, int splitNum) ...@@ -126,7 +126,7 @@ void _Split(const XTensor * s, XTensor * t, int whereToSplit, int splitNum)
void * dataTMP = t->data; void * dataTMP = t->data;
if (!isOnSameDevice) if (!isOnSameDevice)
dataTMP = mem != NULL ? mem->AllocBuf(mem->devID, size) : XMemAlloc(mem->devID, size); dataTMP = mem != NULL ? mem->AllocBuf(mem->devID, size) : XMemAlloc(s->devID, size);
int realBlockSize = blockSize * t->unitSize; int realBlockSize = blockSize * t->unitSize;
int blockSplitSize = blockNum / splitNum; int blockSplitSize = blockNum / splitNum;
......
source/tensor/function/Rectify.cpp
...@@ -34,7 +34,7 @@ rectify function y = max(0, x) ...@@ -34,7 +34,7 @@ rectify function y = max(0, x)
void _Rectify(const XTensor * x, XTensor * y) void _Rectify(const XTensor * x, XTensor * y)
{ {
#ifdef USE_CUDA #ifdef USE_CUDA
if(y->devID >= 0 || y->devID >= 0){ if(x->devID >= 0 || y->devID >= 0){
_CudaRectify(x, y); _CudaRectify(x, y);
return; return;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论