Browse Source

Fix gamma parameter passing

Samuel Thibault 12 years ago
parent
commit
250c9ca8b3
2 changed files with 8 additions and 9 deletions
  1. 3 6
      doc/chapters/perf-optimization.texi
  2. 5 3
      src/core/simgrid.c

+ 3 - 6
doc/chapters/perf-optimization.texi

@@ -495,7 +495,7 @@ application, specifying the requested number of devices:
 @cartouche
 @cartouche
 @smallexample
 @smallexample
 $ ./configure --enable-simgrid && make
 $ ./configure --enable-simgrid && make
-$ STARPU_SCHED=dmda STARPU_NCPU=12 STARPU_NCUDA=0 STARPU_NOPENCL=1 ./examples/matvecmult/matvecmult --cfg=network/TCP_gamma:1000000000
+$ STARPU_SCHED=dmda STARPU_NCPU=12 STARPU_NCUDA=0 STARPU_NOPENCL=1 ./examples/matvecmult/matvecmult
 TEST FAILED !!!
 TEST FAILED !!!
 @end smallexample
 @end smallexample
 @end cartouche
 @end cartouche
@@ -503,15 +503,12 @@ TEST FAILED !!!
 It is normal that the test fails: since the computation are not actually done
 It is normal that the test fails: since the computation are not actually done
 (that is the whole point of simgrid), the result is wrong, of course.
 (that is the whole point of simgrid), the result is wrong, of course.
 
 
-The @code{cfg=network/TCP_gamma} is needed for now to fix CPU/GPU transfer
-simulation.
-
 If the performance model is not calibrated enough, the following error
 If the performance model is not calibrated enough, the following error
 message will be displayed
 message will be displayed
 
 
 @cartouche
 @cartouche
 @smallexample
 @smallexample
-$ STARPU_SCHED=dmda STARPU_NCPU=12 STARPU_NCUDA=0 STARPU_NOPENCL=1 ./examples/matvecmult/matvecmult --cfg=network/TCP_gamma:1000000000
+$ STARPU_SCHED=dmda STARPU_NCPU=12 STARPU_NCUDA=0 STARPU_NOPENCL=1 ./examples/matvecmult/matvecmult
 [0.000000] [xbt_cfg/INFO] type in variable = 2
 [0.000000] [xbt_cfg/INFO] type in variable = 2
 [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 [starpu][_starpu_load_history_based_model] Warning: model matvecmult is not calibrated, forcing calibration for this run. Use the STARPU_CALIBRATE environment variable to control this.
 [starpu][_starpu_load_history_based_model] Warning: model matvecmult is not calibrated, forcing calibration for this run. Use the STARPU_CALIBRATE environment variable to control this.
@@ -528,7 +525,7 @@ parameter @code{--cfg=contexts/stack_size}, for example:
 
 
 @cartouche
 @cartouche
 @smallexample
 @smallexample
-$ STARPU_NCPU=12 STARPU_NCUDA=2 STARPU_NOPENCL=0 ./example --cfg=contexts/stack_size:8192 --cfg=network/TCP_gamma:1000000000
+$ STARPU_NCPU=12 STARPU_NCUDA=2 STARPU_NOPENCL=0 ./example --cfg=contexts/stack_size:8192
 [0.000000] [xbt_cfg/INFO] type in variable = 2
 [0.000000] [xbt_cfg/INFO] type in variable = 2
 [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 TEST FAILED !!!
 TEST FAILED !!!

+ 5 - 3
src/core/simgrid.c

@@ -69,9 +69,6 @@ int main(int argc, char **argv)
 	}
 	}
 
 
 	MSG_init(&argc, argv);
 	MSG_init(&argc, argv);
-	//MSG_config("network/TCP_gamma", "1000000000");
-	//MSG_config("network/latency_factor", "1");
-	//MSG_config("network/bandwidth_factor", "1");
 	MSG_config("workstation/model", "ptask_L07");
 	MSG_config("workstation/model", "ptask_L07");
 
 
 	/* Create platform file */
 	/* Create platform file */
@@ -116,6 +113,11 @@ int main(int argc, char **argv)
 "<?xml version='1.0'?>\n"
 "<?xml version='1.0'?>\n"
 " <!DOCTYPE platform SYSTEM 'http://simgrid.gforge.inria.fr/simgrid.dtd'>\n"
 " <!DOCTYPE platform SYSTEM 'http://simgrid.gforge.inria.fr/simgrid.dtd'>\n"
 " <platform version='3'>\n"
 " <platform version='3'>\n"
+" <config id='General'>\n"
+"   <prop id='network/TCP_gamma' value='1000000000'></prop>\n"
+"   <prop id='network/latency_factor' value='1'></prop>\n"
+"   <prop id='network/bandwidth_factor' value='1'></prop>\n"
+" </config>\n"
 " <AS  id='AS0'  routing='Full'>\n"
 " <AS  id='AS0'  routing='Full'>\n"
 "   <host id='MAIN' power='1'/>\n"
 "   <host id='MAIN' power='1'/>\n"
 		);
 		);