mpi2 separated from mpi

Author: ZocoLini

modules/cli/src/handlers/solve.c

@@ -12,7 +12,7 @@
 #include "../../../cuqdyn-c/include/functions.h"
 #include "cuqdyn.h"
 
-#ifdef MPI
+#if defined(MPI) || defined(MPI2)
 #include <mpi.h>
 #endif
 
@@ -84,15 +84,17 @@ int handle_solve(int argc, char *argv[])
         return 1;
     }
 
-#ifdef MPI
+#if defined(MPI) || defined(MPI2)
     int err = MPI_Init(&argc, &argv);
 
     if (err != MPI_SUCCESS)
     {
         fprintf(stderr, "MPI_Init failed\n");
         exit(1);
     }
+#endif
 
+#ifdef MPI
     int rank, nproc;
     err = MPI_Comm_size(MPI_COMM_WORLD, &nproc);
 

modules/cuqdyn-c/src/cuqdyn.c

@@ -111,6 +111,7 @@ CuqdynResult *cuqdyn_algo(const char *data_file, const char *sacess_conf_file,
     {
         fprintf(stderr, "Number of processes is not a divisor of m - 1. Please use a number of processes that is a "
                         "divisor of m - 1\n");
+        return NULL;
     }
     iterations = min_iters_per_node;
     start_index = rank * iterations + 1;

modules/cuqdyn-c/src/ess_solver.c

@@ -8,7 +8,7 @@
 #include "ess_solver.h"
 
 #include <../include/functions.h>
-#ifdef MPI
+#if defined(MPI2) && !defined(MPI)
 #include <mpi.h>
 #endif
 
@@ -25,6 +25,11 @@ N_Vector execute_ess_solver(const char *file, const char *path, N_Vector texp, D
     result_solver result;
     int first, init;
 
+#if defined(MPI2) && !defined(MPI)
+    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
+    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+#endif
+
 #ifdef OPENMP
 #pragma omp parallel
     {

modules/mexpreval/Cargo.toml

@@ -14,7 +14,7 @@ opt-level = 3
 lto = true
 codegen-units = 1
 panic = "abort"
-strip = "symbols"
+# strip = "symbols"
 
 [[bench]]
 name = "eval_f_exprs_bench"

modules/mexpreval/src/lib.rs

@@ -42,7 +42,7 @@ pub unsafe extern "C" fn eval_f_exprs(
             for (i, ptr) in exprs.iter().enumerate() {
                 let expr = exprs_cache.entry(*ptr).or_insert_with(|| {
                     let c_str = CStr::from_ptr(*ptr);
-                    let s = c_str.to_str().unwrap_unchecked();
+                    let s = c_str.to_str().unwrap();
                     Expr::from_str(s).unwrap_or_else(|e| panic!("Error parsing expresion {}: {}", s, e))
                 });
 

scripts/scalability-test.sh

@@ -3,7 +3,8 @@
 #SBATCH --mem=12G
 #SBATCH -n 30
 #SBATCH --time=1:00:00
-#SBATCH --exclusive -m cyclic:cyclic:fcyclic
+#SBATCH --exclusive
+#SBATCH --distribution=cyclic
 
 if [ -d "/home/cesga" ]; then
     module load gcc openmpi/4.1.1_ft3
@@ -50,7 +51,7 @@ for VARIANT in "${VARIANTS[@]}"; do
         mkdir -p "output/scalability/$VARIANT/$PROCS/$R"
         START_TIME=$(date +%s.%N)
 
-        srun ./build-"$VARIANT"/modules/cli/cli solve \
+        srun --ntasks="$PROCS" --cpus-per-task=1 ./build-"$VARIANT"/modules/cli/cli solve \
           -c example-files/lotka_volterra_cuqdyn_config.xml \
           -s example-files/lotka_volterra_ess_"$VARIANT"_config.xml \
           -d example-files/lotka_volterra_paper_data.txt \