Merge branch 'master' of https://git.labpna.net/Linjian/optimized-ALS

LinjianMa · Nov 25, 2018 · 6c7f8f6 · 6c7f8f6
2 parents b017d57 + 5857059
commit 6c7f8f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/script/script_strongscaling.py b/script/script_strongscaling.py
@@ -42,8 +42,8 @@
     # dim = 6
     # size = int(30*nodes**(1./dim))
 
-    text_file.write("ibrun %s -model CP -tensor r -dim 6 -size 50 -rank 5 -maxiter 5 -filename CP_r_nodes=%s_processes=%s_dim=6_size=50_rank=5_bench.csv -resprint 1\n" % (exe,nodes,mpitask))
-    text_file.write("ibrun %s -model Tucker -tensor r2 -dim 6 -size 50 -rank 4 -maxiter 5 -filename Tucker_r2_nodes=%s_processes=%s_dim=6_size=50_rank=4_bench.csv -resprint 1\n" % (exe,nodes,mpitask))
+    text_file.write("ibrun %s -model CP -tensor r -dim 6 -size 50 -rank 6 -maxiter 5 -filename CP_r_nodes=%s_processes=%s_dim=6_size=50_rank=6_bench.csv -resprint 1\n" % (exe,nodes,mpitask))
+    text_file.write("ibrun %s -model Tucker -tensor r2 -dim 6 -size 50 -rank 6 -maxiter 5 -filename Tucker_r2_nodes=%s_processes=%s_dim=6_size=50_rank=6_bench.csv -resprint 1\n" % (exe,nodes,mpitask))
 
 
     text_file.close()
diff --git a/script/script_synthetic.py b/script/script_synthetic.py
@@ -23,8 +23,8 @@
     text_file.write("#!/bin/bash\n")
     text_file.write("#----------------------------------------------------\n\n\n")
     text_file.write("#SBATCH -J %s\n" % jobname)
-    text_file.write("#SBATCH -o pp.bench.real_data.N%s.n%s.o%%j.out\n" % (nodes,mpitask))
-    text_file.write("#SBATCH -e pp.bench.real_data.N%s.n%s.o%%j.err\n" % (nodes,mpitask))
+    text_file.write("#SBATCH -o pp.bench.syn_data.N%s.n%s.o%%j.out\n" % (nodes,mpitask))
+    text_file.write("#SBATCH -e pp.bench.syn_data.N%s.n%s.o%%j.err\n" % (nodes,mpitask))
     text_file.write("#SBATCH -p %s\n" % queue)
     text_file.write("#SBATCH -N %s\n" % nodes)
     text_file.write("#SBATCH -n %s\n" % mpitask)
@@ -55,7 +55,7 @@
     text_file.write("ibrun %s -model CP -tensor c -pp 1 -dim 6 -size %s -rank %s -maxiter 250 -filename CP_c_nodes=%s_pp=1_dim=6_size=%s_rank=5_restol=0.005.csv -pp_res_tol 0.005 -resprint 10\n\n" % (exe,size,rank,nodes,size))
 
 
-    size = int(13.5*nodes**(1./8))
+    size = int(13*nodes**(1./8))
     rank = 2
 
     text_file.write("ibrun %s -model CP -tensor p -pp 0 -dim 8 -size %s -rank %s -maxiter 250 -filename CP_p_nodes=%s_pp=0_dim=8_size=%s_rank=2.csv -resprint 10\n" % (exe,size,rank,nodes,size))

diff --git a/script/script_weakscaling.py b/script/script_weakscaling.py
@@ -42,8 +42,8 @@
     rank = int(4*nodes**(1./6))
 
     text_file.write("ibrun test_suite\n")
-    text_file.write("ibrun %s -model CP -tensor r -dim 6 -size %s -rank %s -maxiter 5 -filename CP_r_nodes=%s_processes=%s_dim=6_size=%s_rank=5_bench.csv -resprint 1\n" % (exe,size,rank,nodes,mpitask,size))
-    text_file.write("ibrun %s -model Tucker -tensor r2 -dim 6 -size %s -rank %s -maxiter 5 -filename Tucker_r2_nodes=%s_processes=%s_dim=6_size=%s_rank=4_bench.csv -resprint 1\n" % (exe,size,rank,nodes,mpitask,size))
+    text_file.write("ibrun %s -model CP -tensor r -dim 6 -size %s -rank %s -maxiter 5 -filename CP_r_nodes=%s_processes=%s_dim=6_size=%s_rank=%s_bench.csv -resprint 1\n" % (exe,size,rank,nodes,mpitask,size,rank))
+    text_file.write("ibrun %s -model Tucker -tensor r2 -dim 6 -size %s -rank %s -maxiter 5 -filename Tucker_r2_nodes=%s_processes=%s_dim=6_size=%s_rank=%s_bench.csv -resprint 1\n" % (exe,size,rank,nodes,mpitask,size,rank))
 
 
     text_file.close()