Skip to content

Commit 8598910

Browse files
committed
modifying x0 values inside the experiment_total struct works for the mpi version
1 parent 1b2bdb6 commit 8598910

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

example-files/lotka_volterra_ess_mpi_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<verbose>0</verbose>
88
<local_search>1</local_search>
99
<stopping_criteria>
10-
<maxevaluation>2e3</maxevaluation>
10+
<maxevaluation>3e3</maxevaluation>
1111
<maxtime>1e10</maxtime>
1212
<vtr>0</vtr>
1313
</stopping_criteria>

modules/cuqdyn-c/src/cuqdyn.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,11 @@ CuqdynResult *cuqdyn_algo(const char *data_file, const char *sacess_conf_file, c
9797
execute_ess_solver(sacess_conf_file, output_file, texp, yexp, tmp_initial_condition, NULL);
9898

9999
memcpy(NV_DATA_S(initial_params), NV_DATA_S(predicted_params), NV_LENGTH_S(predicted_params) * sizeof(sunrealtype));
100-
101100
N_VDestroy(predicted_params);
102-
103-
#ifdef MPI
104-
MPI_Bcast(NV_DATA_S(initial_params), NV_LENGTH_S(initial_params), MPI_DOUBLE, 0, MPI_COMM_WORLD);
105-
#endif
106101
}
107102

108103
#ifdef MPI
109-
MPI_Barrier(MPI_COMM_WORLD);
104+
MPI_Bcast(NV_DATA_S(initial_params), NV_LENGTH_S(initial_params), MPI_DOUBLE, 0, MPI_COMM_WORLD);
110105

111106
long iterations;
112107
long start_index;

modules/cuqdyn-c/src/ess_solver.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ N_Vector execute_ess_solver(const char *file, const char *path, N_Vector texp, S
8282
{
8383
for (int i = 0; i < NV_LENGTH_S(initial_params); i++)
8484
{
85-
printf("QASDFASDFASDFASDF\n");
8685
exptotal[0].test.bench.X0[0][i] = NV_Ith_S(initial_params, i);
87-
printf("%lf", exptotal[0].test.bench.X0[0][i]);
8886
}
8987
}
9088

modules/sacess/src/input_module/input_module.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,6 @@ int extract_element_problem(xmlDocPtr doc, xmlNodePtr *root, experiment_total *e
10431043
pt = strtok (vector_char[i],",");
10441044
while (pt != NULL) {
10451045
test->bench.X0[i][counter] = atof(pt);
1046-
printf("%lf", test->bench.X0[i][counter]);
10471046
pt = strtok (NULL, ",");
10481047
counter++;
10491048
}

mpi_toolchain.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(CMAKE_C_COMPILER mpicc)
22
set(CMAKE_CXX_COMPILER mpic++)
33
set(CMAKE_Fortran_COMPILER mpifort)
4-
set(CMAKE_C_FLAGS "-O3 -cpp -DGNU -fPIC -no-pie -DOPENMP -DMPI -fopenmp -w")
5-
set(CMAKE_Fortran_FLAGS "-O3 -cpp -DGNU -w -fallow-argument-mismatch -std=gnu -DOPENMP -DMPI -DGNU -fopenmp")
4+
set(CMAKE_C_FLAGS "-O3 -cpp -DGNU -fPIC -no-pie -DMPI -w")
5+
set(CMAKE_Fortran_FLAGS "-O3 -cpp -DGNU -w -fallow-argument-mismatch -std=gnu -DGNU")
66

77
set(MISQP_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/misqp/gnu")
88
set(LIBRARIES mpi)

0 commit comments

Comments
 (0)