X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fphm2rs.cpp;h=ac30c59f90112e989986a2136170d8bc3ae9385f;hp=1e158836251c4f5ee1c3405d4420e1c3b7705480;hb=2451ac413848718a1dd666ce6f6464e974680f47;hpb=f173363bba9997045e5ec825e64d6253ec4da235

diff --git a/src/phm2rs.cpp b/src/phm2rs.cpp
index 1e15883..ac30c59 100644
--- a/src/phm2rs.cpp
+++ b/src/phm2rs.cpp
@@ -1,54 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-** PURPOSE
-**   Generate raysum projections from phantom object
-**
-** HISTORY
-**   1984 -- Final DOS version  
-**   1999 -- First UNIX version
-**
-**  $Id: phm2rs.cpp,v 1.1 2000/06/07 02:29:05 kevin Exp $
-**  $Log: phm2rs.cpp,v $
-**  Revision 1.1  2000/06/07 02:29:05  kevin
-**  Initial C++ versions
-**
-**  Revision 1.12  2000/05/24 22:50:04  kevin
-**  Added support for new SGP library
-**
-**  Revision 1.11  2000/05/16 04:33:59  kevin
-**  Improved option processing
-**
-**  Revision 1.9  2000/05/08 20:02:32  kevin
-**  ANSI C changes
-**
-**  Revision 1.8  2000/05/04 18:16:34  kevin
-**  renamed filter definitions
+** FILE IDENTIFICATION
 **
-**  Revision 1.7  2000/05/03 08:49:50  kevin
-**  Code cleanup
-**
-**  Revision 1.6  2000/04/30 18:23:53  kevin
-**  Code cleaning
-**
-**  Revision 1.5  2000/04/30 10:13:27  kevin
-**  Fixed MPI bugs
-**
-**  Revision 1.4  2000/04/30 04:06:13  kevin
-**  Update Raysum i/o routines
-**  Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
-**
-**  Revision 1.3  2000/04/29 23:24:56  kevin
-**  *** empty log message ***
-**
-**  Revision 1.2  2000/04/28 13:50:45  kevin
-**  Removed Makefile Makefile.in that are automatically generated by autoconf
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
+**   Name:          phm2rs.cpp
+**   Purpose:       Take projections of a phantom object
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  1984
 **
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: phm2rs.cpp,v 1.4 2000/06/09 01:35:33 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -89,10 +50,6 @@ static struct option phm2rs_options[] =
 void 
 phm2rs_usage (const char *program)
 {
-#ifdef MPI_CT
-if (mpi_ct.my_rank == 0)
-  {
-#endif  
   fprintf(stdout,"usage: %s outfile ndet nview [--phantom phantom-name] [--phmfile filename] [OPTIONS]\n", kbasename(program));
   fprintf(stdout,"Calculate raysums (projections) through phantom object, either\n");
   fprintf(stdout,"a predefined --phantom or a --phmfile\n");
@@ -120,18 +77,14 @@ if (mpi_ct.my_rank == 0)
   fprintf(stdout,"     --debug      Debug mode\n");
   fprintf(stdout,"     --version    Print version\n");
   fprintf(stdout,"     --help       Print this help message\n");
-#ifdef MPI_CT
-  }
-  MPI_Abort(mpi_ct.comm, 1);
-#endif
 }
 
-#ifdef MPI_CT
-void mpi_gather_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug);
+#ifdef HAVE_MPI
+void mpi_gather_rs (MPIWorld& mpiWorld, RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug);
 #endif
 
 int 
-phm2rs_main (const int argc, char *const argv[])
+phm2rs_main (int argc, char* argv[])
 {
   DETECTOR *det;
   PHANTOM *phm = NULL;
@@ -147,28 +100,19 @@ phm2rs_main (const int argc, char *const argv[])
   double opt_rotangle = 1;
   double time_start = 0, time_end = 0;
 
-#ifndef MPI_CT
-  time_start = td_current_sec();
-#else
-  RAYSUM *rs_local;
-  int mpi_argc = argc;
-  char **mpi_argv = (char **) argv;
+#ifdef HAVE_MPI
   double mpi_t1 = 0, mpi_t2 = 0, mpi_t, mpi_t_g;
+  RAYSUM *rs_local;
+  MPIWorld mpiWorld (argc, argv);
 
-  MPI_Init(&mpi_argc, &mpi_argv);
-  MPI_Comm_dup (MPI_COMM_WORLD, &mpi_ct.comm);
-  MPI_Comm_size(mpi_ct.comm, &mpi_ct.nproc);
-  MPI_Comm_rank(mpi_ct.comm, &mpi_ct.my_rank);
-
-  if (mpi_ct.nproc > MPI_MAX_PROCESS) {
-    sys_error(ERR_FATAL, "Number of mpi processes (%d) exceeds max processes (%d)", mpi_ct.nproc, MPI_MAX_PROCESS);
-    exit(1);
-  }
-  time_start = MPI_Wtime();
+  time_start = MPI::Wtime();
+#else
+  time_start = td_current_sec();
 #endif
   
-#ifdef MPI_CT
-  if (mpi_ct.my_rank == 0) {
+
+#ifdef HAVE_MPI
+  if (mpiWorld.getRank() == 0) {
 #endif
     strcpy(opt_desc, "");
     strcpy(opt_phmfilename, "");
@@ -189,8 +133,8 @@ phm2rs_main (const int argc, char *const argv[])
 	phm = phm_create (opt_phmnum);
 	break;
       case O_PHMFILE:
-#ifdef MPI_CT
-	if (mpi_ct.my_rank == 0)
+#ifdef HAVE_MPI
+	if (mpiWorld.getRank() == 0)
 	  fprintf(stderr, "Can not read phantom from file in MPI mode\n");
 	return (1);
 #endif
@@ -289,59 +233,62 @@ phm2rs_main (const int argc, char *const argv[])
       strncat(str, opt_desc, sizeof(str));
     }
     strncpy(opt_desc, str, sizeof(opt_desc));
-#ifdef MPI_CT
+#ifdef HAVE_MPI
   }
 #endif
 
-#ifdef MPI_CT
-  MPI_Barrier(mpi_ct.comm);
-  MPI_Bcast(&opt_rotangle, 1, MPI_DOUBLE, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_nview, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_ndet, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_nray, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_phmnum, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_verbose, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_debug, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_trace, 1, MPI_INT, 0, mpi_ct.comm);
-
-  if (mpi_ct.my_rank > 0 && opt_phmnum >= 0)
+#ifdef HAVE_MPI
+  mpiWorld.getComm().Barrier ();
+  mpiWorld.getComm().Bcast (&opt_rotangle, 1, MPI::DOUBLE, 0);
+  mpiWorld.getComm().Bcast (&opt_nview, 1, MPI::INT, 0);
+  mpiWorld.getComm().Bcast (&opt_ndet, 1, MPI::INT, 0);
+  mpiWorld.getComm().Bcast (&opt_nray, 1, MPI::INT, 0);
+  mpiWorld.getComm().Bcast (&opt_phmnum, 1, MPI::INT, 0);
+  mpiWorld.getComm().Bcast (&opt_verbose, 1, MPI::INT, 0);
+  mpiWorld.getComm().Bcast (&opt_debug, 1, MPI::INT, 0);
+  mpiWorld.getComm().Bcast (&opt_trace, 1, MPI::INT, 0);
+
+  if (mpiWorld.getRank() > 0 && opt_phmnum >= 0)
     phm = phm_create (opt_phmnum);
 #endif
 
   opt_rotangle *= PI;
   det = detector_create (phm, DETECTOR_PARALLEL, opt_ndet, opt_nview, opt_nray, opt_rotangle);
 
-#ifdef MPI_CT
-  mpi_ct_calc_work_units(opt_nview);
-  if (mpi_ct.my_rank == 0) {
+#ifdef HAVE_MPI
+  mpiWorld.setTotalWorkUnits (opt_nview);
+
+  if (mpiWorld.getRank() == 0) {
     rs_global = raysum_create_from_det (opt_outfile, det);
     raysum_alloc_views(rs_global);
   }
   
   rs_local = raysum_create_from_det (NULL, det);
-  rs_local->nview = mpi_ct.local_work_units[mpi_ct.my_rank];
+  rs_local->nview = mpiWorld.getMyLocalWorkUnits();
   if (opt_debug)
-    printf("rs_local->nview = %d (process %d)\n", rs_local->nview, mpi_ct.my_rank);
+    printf("rs_local->nview = %d (process %d)\n", rs_local->nview, mpiWorld.getRank());
 
   if (opt_verbose)
-    mpi_t1 = MPI_Wtime();
-  raysum_collect (rs_local, det, phm, mpi_ct.start_work_unit[mpi_ct.my_rank], opt_trace, FALSE);
+    mpi_t1 = MPI::Wtime();
+  raysum_collect (rs_local, det, phm, mpiWorld.getMyStartWorkUnit(), opt_trace, FALSE);
   if (opt_verbose) {
-    mpi_t2 = MPI_Wtime();
+    mpi_t2 = MPI::Wtime();
     mpi_t = mpi_t2 - mpi_t1;
-    MPI_Reduce(&mpi_t, &mpi_t_g, 1, MPI_DOUBLE, MPI_MAX, 0, mpi_ct.comm);
-    if (mpi_ct.my_rank == 0)
+    mpiWorld.getComm().Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0);
+    if (mpiWorld.getRank() == 0)
       printf("Time to collect rs = %f secs, Max = %f secs\n", mpi_t, mpi_t_g);
   }
 
   if (opt_verbose)
-    mpi_t1 = MPI_Wtime();
-  mpi_gather_rs(rs_global, rs_local, opt_debug);
+    mpi_t1 = MPI::Wtime();
+
+  mpi_gather_rs (mpiWorld, rs_global, rs_local, opt_debug);
+
   if (opt_verbose) {
-    mpi_t2 = MPI_Wtime();
+    mpi_t2 = MPI::Wtime();
     mpi_t = mpi_t2 - mpi_t1;
-    MPI_Reduce(&mpi_t, &mpi_t_g, 1, MPI_DOUBLE, MPI_MAX, 0, mpi_ct.comm);
-    if (mpi_ct.my_rank == 0)
+    mpiWorld.getComm().Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0);
+    if (mpiWorld.getRank() == 0)
       printf("Time to gather rs = %f secs, Max = %f secs\n", mpi_t, mpi_t_g);
   }
 #else
@@ -349,11 +296,11 @@ phm2rs_main (const int argc, char *const argv[])
   raysum_collect (rs_global, det, phm, 0, opt_trace, FALSE);
 #endif
   
-#ifndef MPI_CT
+#ifndef HAVE_MPI
   time_end = td_current_sec();
 #else
-  time_end = MPI_Wtime();
-  if (mpi_ct.my_rank == 0) 
+  time_end = MPI::Wtime();
+  if (mpiWorld.getRank() == 0) 
 #endif
     {
       rs_global->calctime = time_end - time_start;
@@ -364,8 +311,8 @@ phm2rs_main (const int argc, char *const argv[])
       }
     }
 
-#ifdef MPI_CT
-  if (mpi_ct.my_rank == 0) 
+#ifdef HAVE_MPI
+  if (mpiWorld.getRank() == 0) 
 #endif
     {
       raysum_write (rs_global);
@@ -386,35 +333,23 @@ phm2rs_main (const int argc, char *const argv[])
  *    Gather's raysums from all processes in rs_local in rs_global in process 0
  */
 
-#ifdef MPI_CT
-void mpi_gather_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug)
+#ifdef HAVE_MPI
+void mpi_gather_rs (MPIWorld& mpiWorld, RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug)
 {
-  int iproc;
-  int end_work_unit;
-  int iw;
-
-  end_work_unit = mpi_ct.local_work_units[mpi_ct.my_rank] - 1;
-  for (iw = 0; iw <= end_work_unit; iw++) {
-    MPI_Send(&rs_local->view[iw]->view_angle, 1, MPI_DOUBLE, 0, 0, mpi_ct.comm);
-    MPI_Send(&rs_local->view[iw]->ndet, 1, MPI_INT, 0, 0, mpi_ct.comm);
-    MPI_Send(rs_local->view[iw]->detval, rs_local->ndet, MPI_FLOAT, 0, 0, mpi_ct.comm);
+  for (int iw = 0; iw < mpiWorld.getMyLocalWorkUnits(); iw++) {
+    mpiWorld.getComm().Send(&rs_local->view[iw]->view_angle, 1, MPI::DOUBLE, 0, 0);
+    mpiWorld.getComm().Send(&rs_local->view[iw]->ndet, 1, MPI::INT, 0, 0);
+    mpiWorld.getComm().Send(rs_local->view[iw]->detval, rs_local->ndet, MPI::FLOAT, 0, 0);
   }
 
-  if (mpi_ct.my_rank == 0) {
-    for (iproc = 0; iproc < mpi_ct.nproc; iproc++) {
-      end_work_unit = mpi_ct.start_work_unit[iproc] 
-	+ mpi_ct.local_work_units[iproc] 
-	- 1;
-
-      if (opt_debug)
-	fprintf(stdout, "Recv rs data from process %d\n", iproc);
-
-      for (iw = mpi_ct.start_work_unit[iproc]; iw <= end_work_unit; iw++) {
-	MPI_Status status;
+  if (mpiWorld.getRank() == 0) {
+    for (int iProc = 0; iProc < mpiWorld.getNumProcessors(); iProc++) {
+      for (int iw = mpiWorld.getStartWorkUnit(iProc); iw <= mpiWorld.getEndWorkUnit(iProc); iw++) {
+	MPI::Status status;
 
-	MPI_Recv(&rs_global->view[iw]->view_angle, 1, MPI_DOUBLE, iproc, 0, mpi_ct.comm, &status);
-	MPI_Recv(&rs_global->view[iw]->ndet, 1, MPI_INT, iproc, 0, mpi_ct.comm, &status);
-	MPI_Recv(rs_global->view[iw]->detval, rs_global->ndet, MPI_FLOAT, iproc, 0, mpi_ct.comm, &status);
+	mpiWorld.getComm().Recv(&rs_global->view[iw]->view_angle, 1, MPI::DOUBLE, iProc, 0, status);
+	mpiWorld.getComm().Recv(&rs_global->view[iw]->ndet, 1, MPI::INT, iProc, 0, status);
+	mpiWorld.getComm().Recv(rs_global->view[iw]->detval, rs_global->ndet, MPI::FLOAT, iProc, 0, status);
       }
     }
   }
@@ -425,7 +360,7 @@ void mpi_gather_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug)
 
 #ifndef NO_MAIN
 int 
-main (const int argc, char *const argv[])
+main (int argc, char* argv[])
 {
   return (phm2rs_main(argc, argv));
 }