Commit 4faf81de by liyinqiao

Bug fixed

1. Enable the isGradEfficient;
2. Adjust global memory size.
parent d969fe7b
...@@ -55,7 +55,7 @@ void XNetClearAll() ...@@ -55,7 +55,7 @@ void XNetClearAll()
XNet::XNet() XNet::XNet()
{ {
nodes.Clear(); nodes.Clear();
isGradEfficient = false; isGradEfficient = true;
} }
/* de-constructor */ /* de-constructor */
......
...@@ -1562,9 +1562,9 @@ void XMemManager::GetBufferSize(MTYPE freeMem, MTYPE * myBufSize) ...@@ -1562,9 +1562,9 @@ void XMemManager::GetBufferSize(MTYPE freeMem, MTYPE * myBufSize)
if (freeMem >= MILLION * 512){ if (freeMem >= MILLION * 512){
*myBufSize = MILLION * 128; *myBufSize = MILLION * 128;
if (freeMem >= MILLION * 1024) { if (freeMem >= MILLION * 1024) {
*myBufSize = MILLION * 256; *myBufSize = MILLION * 128;
if (freeMem >= MILLION * 2048) if (freeMem >= MILLION * 2048)
*myBufSize = MILLION * 512; *myBufSize = MILLION * 128;
} }
} }
} }
...@@ -1596,9 +1596,9 @@ void XMemManager::Initialize() ...@@ -1596,9 +1596,9 @@ void XMemManager::Initialize()
/* free it */ /* free it */
void XMemManager::Free() void XMemManager::Free()
{ {
for (int i = 0; i < MAX_CPU_NUM; i++) for (int i = 0; i < MAX_CPU_MEM_NUM; i++)
CPUMems[i].Free(); CPUMems[i].Free();
for (int i = 0; i < MAX_GPU_NUM; i++) for (int i = 0; i < MAX_GPU_MEM_NUM; i++)
GPUMems[i].Free(); GPUMems[i].Free();
} }
......
...@@ -60,10 +60,10 @@ typedef long long INT_64; ...@@ -60,10 +60,10 @@ typedef long long INT_64;
#define CUDA_HOST_MALLOC 1 #define CUDA_HOST_MALLOC 1
#define MY_PITCH CUDA_PITCH #define MY_PITCH CUDA_PITCH
#define BUF_PITCH 256 #define BUF_PITCH 256
#define MIN_BLOCK_SIZE_FOR_MEMPOOL 128 * 1024 * 1024 #define MIN_BLOCK_SIZE_FOR_MEMPOOL 256 * 1024 * 1024
#define MIN_BLOCK_NUM_FOR_MEMPOOL 1024 #define MIN_BLOCK_NUM_FOR_MEMPOOL 1024
#define MAX_CPU_NUM 1 #define MAX_CPU_MEM_NUM 16
#define MAX_GPU_NUM 1 #define MAX_GPU_MEM_NUM 16
/* /*
mode of runnig a memory pool mode of runnig a memory pool
...@@ -434,13 +434,13 @@ class XMemManager ...@@ -434,13 +434,13 @@ class XMemManager
{ {
private: private:
/* cpu memory pool information */ /* cpu memory pool information */
XMem CPUMems[MAX_CPU_NUM]; XMem CPUMems[MAX_CPU_MEM_NUM];
/* number of cpu memory pools */ /* number of cpu memory pools */
int nCPUMem; int nCPUMem;
/* gpu memory pool information */ /* gpu memory pool information */
XMem GPUMems[MAX_GPU_NUM]; XMem GPUMems[MAX_GPU_MEM_NUM];
/* number of gpu memory pools */ /* number of gpu memory pools */
int nGPUMem; int nGPUMem;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论