restore windows progress bar support, disabled in @ae2d60e45

fangq · Aug 18, 2020 · 883f61b · 883f61b
1 parent c3ff56e
commit 883f61b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/mcx_core.cu b/src/mcx_core.cu
@@ -1734,7 +1734,9 @@ void mcx_run_simulation(Config *cfg,GPUInfo *gpu){
      uint    detected=0,sharedbuf=0;
 
      volatile int *progress, *gprogress;
+#ifdef _WIN32
      cudaEvent_t updateprogress;
+#endif
 
      uint *gmedia;
      float4 *gPpos,*gPdir,*gPlen;
@@ -2117,11 +2119,13 @@ void mcx_run_simulation(Config *cfg,GPUInfo *gpu){
 	     CUDA_ASSERT(cudaMemcpy(gPseed, Pseed, sizeof(RandType)*gpu[gpuid].autothread*RAND_BUF_LEN,  cudaMemcpyHostToDevice));
            }
            tic0=GetTimeMillis();
+#ifdef _WIN32
 #pragma omp master
 {
            if(cfg->debuglevel & MCX_DEBUG_PROGRESS)
                CUDA_ASSERT(cudaEventCreate(&updateprogress));
 }
+#endif
            MCX_FPRINTF(cfg->flog,"simulation run#%2d ... \n",iter+1); fflush(cfg->flog);
            mcx_flush(cfg);
 
@@ -2144,14 +2148,14 @@ void mcx_run_simulation(Config *cfg,GPUInfo *gpu){
 {
            if((param.debuglevel & MCX_DEBUG_PROGRESS)){
 	     int p0 = 0, ndone=-1;
-//#ifndef WIN32
-//             CUDA_ASSERT(cudaEventRecord(updateprogress));
-//#endif
+#ifdef _WIN32
+             CUDA_ASSERT(cudaEventRecord(updateprogress));
+#endif
 	     mcx_progressbar(-0.f,cfg);
 	     do{
-//#ifndef WIN32
-//               CUDA_ASSERT(cudaEventQuery(updateprogress));
-//#endif
+#ifndef _WIN32
+               cudaEventQuery(updateprogress);
+#endif
                ndone = *progress;
 	       if (ndone > p0){
 		  mcx_progressbar(ndone/((param.threadphoton>>1)*4.5f),cfg);