[Genabel-commits] r1864 - in pkg/OmicABELnoMM: doc src

[noreply at r-forge.r-project.org]

Author: afrank
Date: 2014-10-28 14:00:11 +0100 (Tue, 28 Oct 2014)
New Revision: 1864

Modified:
   pkg/OmicABELnoMM/doc/howtocompile.txt
   pkg/OmicABELnoMM/src/Definitions.h
   pkg/OmicABELnoMM/src/main.cpp
Log:
Added base for MPI conditionals to disable it. Still not working.

Modified: pkg/OmicABELnoMM/doc/howtocompile.txt
===================================================================
--- pkg/OmicABELnoMM/doc/howtocompile.txt	2014-10-28 12:19:40 UTC (rev 1863)
+++ pkg/OmicABELnoMM/doc/howtocompile.txt	2014-10-28 13:00:11 UTC (rev 1864)
@@ -118,5 +118,7 @@
 
 lscpu
 
+-------------------------------install m4 files
+m4_ax_prog_cxx_mpi.m4
 
-
+autoreconf -i -I.

Modified: pkg/OmicABELnoMM/src/Definitions.h
===================================================================
--- pkg/OmicABELnoMM/src/Definitions.h	2014-10-28 12:19:40 UTC (rev 1863)
+++ pkg/OmicABELnoMM/src/Definitions.h	2014-10-28 13:00:11 UTC (rev 1864)
@@ -25,8 +25,13 @@
 #include <pthread.h>
 #include <utility>
 #include <iomanip>
+
+#ifdef HAVE_MPI
 #include <mpi.h>
+pragma message("Compiled with MPI SUPPORT")
+#endif
 
+
 #ifdef WINDOWS
     #include <windows.h>
 #else

Modified: pkg/OmicABELnoMM/src/main.cpp
===================================================================
--- pkg/OmicABELnoMM/src/main.cpp	2014-10-28 12:19:40 UTC (rev 1863)
+++ pkg/OmicABELnoMM/src/main.cpp	2014-10-28 13:00:11 UTC (rev 1864)
@@ -410,6 +410,7 @@
     alg.applyDefaultParams(params);
 
     //!MPI
+    #ifdef USE_MPI
     int size, rank;
     MPI_Init(&argc, &argv);
     MPI_Comm_size(MPI_COMM_WORLD, &size);
@@ -417,8 +418,10 @@
     //printf("SIZE = %d RANK = %d\n", size,rank);
     params.mpi_id = rank;
     params.mpi_num_threads = size;
+    #endif
 
 
+
     parse_params(argc, argv, params);
 
 
@@ -453,7 +456,9 @@
     cout << endl;
 
     //!MPI
+    #ifdef USE_MPI
     MPI_Finalize();
+    #endif
 
     return 0;
 }