Merge branch 'master' of https://github.com/fangq/mcx

fangq · fangq · commit e37fc54f8afe · 2018-08-20T13:38:14.000-04:00
diff --git a/src/mcxlab.cpp b/src/mcxlab.cpp
@@ -128,7 +128,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]){
             mcx_initcfg(&cfg);
             cfg.isgpuinfo=3;
             if(!(activedev=mcx_list_gpu(&cfg,&gpuinfo))){
-                mexWarnMsgTxt("no active GPU device found");
+                mexErrMsgTxt("no active GPU device found");
             }
             plhs[0] = mxCreateStructMatrix(gpuinfo[0].devcount,1,15,gpuinfotag);
             for(int i=0;i<gpuinfo[0].devcount;i++){

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ void mexFunction(int nlhs, mxArray plhs[], int nrhs, const mxArray prhs[]){`
`128`	`128`	`mcx_initcfg(&cfg);`
`129`	`129`	`cfg.isgpuinfo=3;`
`130`	`130`	`if(!(activedev=mcx_list_gpu(&cfg,&gpuinfo))){`
`131`		`- mexWarnMsgTxt("no active GPU device found");`
	`131`	`+ mexErrMsgTxt("no active GPU device found");`
`132`	`132`	`}`
`133`	`133`	`plhs[0] = mxCreateStructMatrix(gpuinfo[0].devcount,1,15,gpuinfotag);`
`134`	`134`	`for(int i=0;i<gpuinfo[0].devcount;i++){`