Skip to content

Commit e4abccf

Browse files
william-dawsonwilliam-dawson
committed
Remove be_verbose option from the process grid
Since it was doing nothing
1 parent a963d8b commit e4abccf

File tree

6 files changed

+28
-67
lines changed

6 files changed

+28
-67
lines changed

‎Source/C/ProcessGrid_c.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44
void ConstructGlobalProcessGrid_wrp(const int *world_comm,
55
const int *process_rows,
66
const int *process_columns,
7-
const int *process_slices,
8-
const bool *be_verbose);
7+
const int *process_slices);
98
void ConstructGlobalProcessGrid_onlyslice_wrp(const int *world_comm,
10-
const int *process_slices,
11-
const bool *be_verbose);
12-
void ConstructGlobalProcessGrid_default_wrp(const int *world_comm,
13-
const bool *be_verbose);
9+
const int *process_slices);
10+
void ConstructGlobalProcessGrid_default_wrp(const int *world_comm);
1411
void CopyProcessGrid_wrp(const int *ih_old_grid, int *ih_new_grid);
1512
int GetGlobalMySlice_wrp();
1613
int GetGlobalMyColumn_wrp();

‎Source/CPlusPlus/ProcessGrid.cc

+10-14
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,36 @@ ProcessGrid::~ProcessGrid() { DestructProcessGrid_wrp(ih_this); }
7373

7474
////////////////////////////////////////////////////////////////////////////////
7575
void ConstructGlobalProcessGrid(MPI_Comm world_comm, int process_rows,
76-
int process_columns, int process_slices,
77-
bool be_verbose) {
76+
int process_columns, int process_slices) {
7877
MPI_Fint temp_comm = MPI_Comm_c2f(world_comm);
7978
ConstructGlobalProcessGrid_wrp(&temp_comm, &process_rows, &process_columns,
80-
&process_slices, &be_verbose);
79+
&process_slices);
8180
}
8281

8382
////////////////////////////////////////////////////////////////////////////////
8483
void ConstructGlobalProcessGrid(int process_rows, int process_columns,
85-
int process_slices, bool be_verbose) {
84+
int process_slices) {
8685
MPI_Fint temp_comm = MPI_Comm_c2f(MPI_COMM_WORLD);
8786
ConstructGlobalProcessGrid_wrp(&temp_comm, &process_rows, &process_columns,
88-
&process_slices, &be_verbose);
87+
&process_slices);
8988
}
9089

9190
////////////////////////////////////////////////////////////////////////////////
92-
void ConstructGlobalProcessGrid(MPI_Comm world_comm, int process_slices,
93-
bool be_verbose) {
91+
void ConstructGlobalProcessGrid(MPI_Comm world_comm, int process_slices) {
9492
MPI_Fint temp_comm = MPI_Comm_c2f(world_comm);
95-
ConstructGlobalProcessGrid_onlyslice_wrp(&temp_comm, &process_slices,
96-
&be_verbose);
93+
ConstructGlobalProcessGrid_onlyslice_wrp(&temp_comm, &process_slices);
9794
}
9895

9996
////////////////////////////////////////////////////////////////////////////////
100-
void ConstructGlobalProcessGrid(int process_slices, bool be_verbose) {
97+
void ConstructGlobalProcessGrid(int process_slices) {
10198
MPI_Fint temp_comm = MPI_Comm_c2f(MPI_COMM_WORLD);
102-
ConstructGlobalProcessGrid_onlyslice_wrp(&temp_comm, &process_slices,
103-
&be_verbose);
99+
ConstructGlobalProcessGrid_onlyslice_wrp(&temp_comm, &process_slices);
104100
}
105101

106102
////////////////////////////////////////////////////////////////////////////////
107-
void ConstructGlobalProcessGrid(bool be_verbose) {
103+
void ConstructGlobalProcessGrid() {
108104
MPI_Fint temp_comm = MPI_Comm_c2f(MPI_COMM_WORLD);
109-
ConstructGlobalProcessGrid_default_wrp(&temp_comm, &be_verbose);
105+
ConstructGlobalProcessGrid_default_wrp(&temp_comm);
110106
}
111107

112108
////////////////////////////////////////////////////////////////////////////////

‎Source/CPlusPlus/ProcessGrid.h

+5-12
Original file line numberDiff line numberDiff line change
@@ -76,31 +76,24 @@ class ProcessGrid {
7676
//! \param[in] process_rows number of grid rows.
7777
//! \param[in] process_columns number of grid columns.
7878
//! \param[in] process_slices number of grid slices.
79-
//! \param[in] be_verbose verbosity flag.
8079
void ConstructGlobalProcessGrid(MPI_Comm world_comm, int process_rows,
81-
int process_columns, int process_slices,
82-
bool be_verbose = false);
80+
int process_columns, int process_slices);
8381
//! Construct the global process grid from comm world
8482
//! \param[in] process_rows number of grid rows.
8583
//! \param[in] process_columns number of grid columns.
8684
//! \param[in] process_slices number of grid slices.
87-
//! \param[in] be_verbose verbosity flag.
8885
void ConstructGlobalProcessGrid(int process_rows, int process_columns,
89-
int process_slices, bool be_verbose = false);
86+
int process_slices);
9087
//! Construct the global process grid.
9188
//! \param[in] world_comm a communicator that every process in the grid is
9289
//! a part of.
9390
//! \param[in] process_slices number of grid slices.
94-
//! \param[in] be_verbose verbosity flag.
95-
void ConstructGlobalProcessGrid(MPI_Comm world_comm, int process_slices,
96-
bool be_verbose = false);
91+
void ConstructGlobalProcessGrid(MPI_Comm world_comm, int process_slices);
9792
//! Construct the global process grid from comm world
9893
//! \param[in] process_slices number of grid slices.
99-
//! \param[in] be_verbose verbosity flag.
100-
void ConstructGlobalProcessGrid(int process_slices, bool be_verbose = false);
94+
void ConstructGlobalProcessGrid(int process_slices);
10195
//! Construct the global process grid from comm world
102-
//! \param[in] be_verbose verbosity flag.
103-
void ConstructGlobalProcessGrid(bool be_verbose = false);
96+
void ConstructGlobalProcessGrid();
10497
//! Get the slice of the current process.
10598
int GetGlobalMySlice();
10699
//! Get the column of the current process.

‎Source/Fortran/ProcessGridModule.F90

+3-24
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MODULE ProcessGridModule
8282
CONTAINS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
8383
!> Setup the default process grid.
8484
SUBROUTINE ConstructProcessGrid_full(world_comm, process_rows, &
85-
& process_columns, process_slices, be_verbose_in)
85+
& process_columns, process_slices)
8686
!> A communicator that every process in the grid is a part of.
8787
INTEGER, INTENT(IN) :: world_comm
8888
!> The number of grid rows.
@@ -91,33 +91,18 @@ SUBROUTINE ConstructProcessGrid_full(world_comm, process_rows, &
9191
INTEGER, INTENT(IN) :: process_columns
9292
!> The number of grid slices.
9393
INTEGER, INTENT(IN) :: process_slices
94-
!> Set true to print process grid info.
95-
LOGICAL, INTENT(IN), OPTIONAL :: be_verbose_in
96-
!! Local Data
97-
LOGICAL :: be_verbose
98-
99-
!! Process Optional Parameters
100-
IF (PRESENT(be_verbose_in)) THEN
101-
be_verbose = be_verbose_in
102-
ELSE
103-
be_verbose = .FALSE.
104-
END IF
10594

10695
CALL ConstructNewProcessGrid(global_grid, world_comm, process_rows, &
10796
& process_columns, process_slices)
10897
END SUBROUTINE ConstructProcessGrid_full
10998
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
11099
!> Setup a process grid specifying only the slices
111-
SUBROUTINE ConstructProcessGrid_onlyslice(world_comm, process_slices_in, &
112-
& be_verbose_in)
100+
SUBROUTINE ConstructProcessGrid_onlyslice(world_comm, process_slices_in)
113101
!> A communicator that every process in the grid is a part of.
114102
INTEGER, INTENT(IN) :: world_comm
115103
!> The number of grid slices.
116104
INTEGER, INTENT(IN), OPTIONAL :: process_slices_in
117-
!> Set true to print process grid info.
118-
LOGICAL, INTENT(IN), OPTIONAL :: be_verbose_in
119105
!! Local Data
120-
LOGICAL :: be_verbose
121106
INTEGER :: process_rows, process_columns, process_slices
122107
INTEGER :: total_processors
123108
INTEGER :: ierr
@@ -126,12 +111,6 @@ SUBROUTINE ConstructProcessGrid_onlyslice(world_comm, process_slices_in, &
126111
CALL MPI_COMM_SIZE(world_comm, total_processors, ierr)
127112

128113
!! Process Optional Parameters
129-
IF (PRESENT(be_verbose_in)) THEN
130-
be_verbose = be_verbose_in
131-
ELSE
132-
be_verbose = .FALSE.
133-
END IF
134-
135114
IF (PRESENT(process_slices_in)) THEN
136115
process_slices = process_slices_in
137116
ELSE
@@ -144,7 +123,7 @@ SUBROUTINE ConstructProcessGrid_onlyslice(world_comm, process_slices_in, &
144123

145124
!! Now call the full setup
146125
CALL ConstructProcessGrid(world_comm, process_rows, process_columns, &
147-
& process_slices, be_verbose)
126+
& process_slices)
148127
END SUBROUTINE ConstructProcessGrid_onlyslice
149128
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
150129
!> Construct a process grid.

‎Source/Wrapper/ProcessGridModule_wrp.F90

+6-10
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,30 @@ MODULE ProcessGridModule_wrp
4040
CONTAINS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4141
!> Wrap the process grid construction routine.
4242
SUBROUTINE ConstructGlobalProcessGrid_wrp(world_comm_, process_rows_, &
43-
& process_columns_, process_slices_, be_verbose) &
43+
& process_columns_, process_slices_) &
4444
& BIND(c,name="ConstructGlobalProcessGrid_wrp")
4545
INTEGER(kind=c_int), INTENT(IN) :: world_comm_
4646
INTEGER(kind=c_int), INTENT(IN) :: process_rows_
4747
INTEGER(kind=c_int), INTENT(IN) :: process_columns_
4848
INTEGER(kind=c_int), INTENT(IN) :: process_slices_
49-
LOGICAL(kind=c_bool), INTENT(IN) :: be_verbose
5049
CALL ConstructProcessGrid(world_comm_, process_rows_, process_columns_, &
51-
& process_slices_, LOGICAL(be_verbose))
50+
& process_slices_)
5251
END SUBROUTINE ConstructGlobalProcessGrid_wrp
5352
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5453
!> Wrap the process grid construction routine.
5554
SUBROUTINE ConstructGlobalProcessGrid_onlyslice_wrp(world_comm_, &
56-
& process_slices_, be_verbose) &
55+
& process_slices_) &
5756
& BIND(c,name="ConstructGlobalProcessGrid_onlyslice_wrp")
5857
INTEGER(kind=c_int), INTENT(IN) :: world_comm_
5958
INTEGER(kind=c_int), INTENT(IN) :: process_slices_
60-
LOGICAL(kind=c_bool), INTENT(IN) :: be_verbose
61-
CALL ConstructProcessGrid(world_comm_, process_slices_in=process_slices_, &
62-
& be_verbose_in=LOGICAL(be_verbose))
59+
CALL ConstructProcessGrid(world_comm_, process_slices_in=process_slices_)
6360
END SUBROUTINE ConstructGlobalProcessGrid_onlyslice_wrp
6461
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
6562
!> Wrap the process grid construction routine.
66-
SUBROUTINE ConstructGlobalProcessGrid_default_wrp(world_comm_, be_verbose) &
63+
SUBROUTINE ConstructGlobalProcessGrid_default_wrp(world_comm_) &
6764
& BIND(c,name="ConstructGlobalProcessGrid_default_wrp")
6865
INTEGER(kind=c_int), INTENT(IN) :: world_comm_
69-
LOGICAL(kind=c_bool), INTENT(IN) :: be_verbose
70-
CALL ConstructProcessGrid(world_comm_, be_verbose_in=LOGICAL(be_verbose))
66+
CALL ConstructProcessGrid(world_comm_)
7167
END SUBROUTINE ConstructGlobalProcessGrid_default_wrp
7268
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
7369
!> Get the slice of the current process.

‎UnitTests/test_chemistry.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def setUpClass(self):
7676
rows = int(environ['PROCESS_ROWS'])
7777
columns = int(environ['PROCESS_COLUMNS'])
7878
slices = int(environ['PROCESS_SLICES'])
79-
nt.ConstructGlobalProcessGrid(rows, columns, slices, True)
79+
nt.ConstructGlobalProcessGrid(rows, columns, slices)
8080

8181
@classmethod
8282
def tearDownClass(self):

0 commit comments

Comments
 (0)