Merge pull request #112 from nlesc-dirac/dev

update master from dev
nlesc-dirac · Sep 12, 2019 · 5f75351 · 5f75351
2 parents 7b3c9e4 + 984f17b
commit 5f75351
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/MPI/main.cpp b/src/MPI/main.cpp
@@ -34,7 +34,7 @@ using namespace Data;
 
 void
 print_copyright(void) {
-  cout<<"SAGECal-MPI 0.6.1 (C) 2011-2019 Sarod Yatawatta"<<endl;
+  cout<<"SAGECal-MPI 0.6.2 (C) 2011-2020 Sarod Yatawatta"<<endl;
 }
 
 

diff --git a/src/MS/main.cpp b/src/MS/main.cpp
@@ -38,7 +38,7 @@ using namespace Data;
 
 void
 print_copyright(void) {
-  cout<<"SAGECal 0.6.1 (C) 2011-2019 Sarod Yatawatta"<<endl;
+  cout<<"SAGECal 0.6.2 (C) 2011-2020 Sarod Yatawatta"<<endl;
 }
 
 

diff --git a/src/lib/Radio/Radio.h b/src/lib/Radio/Radio.h
@@ -46,9 +46,6 @@
 #include <cuda_runtime_api.h>
 #endif /* HAVE_CUDA */
 
-#ifndef MAX_GPU_ID
-#define MAX_GPU_ID 3 /* use 0 (1 GPU), 1 (2 GPUs), ... */
-#endif
 /* default value for threads per block */
 #ifndef DEFAULT_TH_PER_BK 
 #define DEFAULT_TH_PER_BK 64

diff --git a/src/lib/Radio/predict_withbeam_cuda.c b/src/lib/Radio/predict_withbeam_cuda.c
@@ -20,6 +20,7 @@
 
 
 #include "Radio.h"
+#include "GPUtune.h"
 
 //#define CUDA_DEBUG
 static void
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ using namespace Data; @@
     void
     print_copyright(void) {
-      cout<<"SAGECal-MPI 0.6.1 (C) 2011-2019 Sarod Yatawatta"<<endl;
+      cout<<"SAGECal-MPI 0.6.2 (C) 2011-2020 Sarod Yatawatta"<<endl;
     }
@@ Expand Down @@