Merge branch 'main' of https://github.com/STEllAR-GROUP/parallelnumer…

…icalintegration
STEllAR-GROUP · Jan 9, 2023 · bf95da5 · bf95da5
2 parents 27c6331 + 818362e
commit bf95da5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/benchmark.sh b/benchmark.sh
@@ -4,20 +4,20 @@ len=100000000
 path=$(pwd)
 # Taylor HPX parallel algorithms
 
-#for i in {64..1}
-#do
-#    ${path}/build/src/taylor_future ${len} 0.5 $i >> $1_taylor_future.csv
-#done
+for i in {64..1}
+do
+    ${path}/build/src/taylor_future ${len} 0.5 $i >> $1_taylor_future.csv
+done
 
-#for i in {64..1}
-#do
-#	srun  ${path}/build/src/taylor_future_hpx ${len} 0.5 $i --hpx:threads=$i >> $1_taylor_future_hpx.csv
-#done
+for i in {64..1}
+do
+	srun  ${path}/build/src/taylor_future_hpx ${len} 0.5 $i --hpx:threads=$i >> $1_taylor_future_hpx.csv
+done
 
-#for i in {64..1}
-#do
-#    srun  ${path}/build/src/taylor_par_hpx ${len} 0.5 --hpx:threads=$i >> $1_taylor_par_hpx.csv
-#done
+for i in {64..1}
+do
+    srun  ${path}/build/src/taylor_par_hpx ${len} 0.5 --hpx:threads=$i >> $1_taylor_par_hpx.csv
+done
 
 for i in {42..1}
 do

diff --git a/src/taylor_future_coroutine_hpx.cpp b/src/taylor_future_coroutine_hpx.cpp
@@ -56,7 +56,7 @@ int main(int args, char** argv) {
   int n = std::stoi(argv[1]);
   double x = std::stod(argv[2]);
   size_t amount = std::stoi(argv[3]);
-  
+
   auto start = std::chrono::high_resolution_clock::now();
   double result = run(n, amount, x).get();