Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
mv simdag platforms to the right place
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 22 Feb 2016 20:26:19 +0000 (21:26 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 22 Feb 2016 20:26:19 +0000 (21:26 +0100)
 + and traces too

18 files changed:
examples/platforms/2clusters.xml [moved from examples/simdag/2clusters.xml with 100% similarity]
examples/platforms/faulty_host.xml [moved from examples/simdag/faulty_host.xml with 73% similarity]
examples/platforms/trace/faulty_host.trace [moved from examples/simdag/faulty_host.trace with 100% similarity]
examples/platforms/trace/jupiter_speed.trace [moved from examples/simdag/jupiter_power.trace with 100% similarity]
examples/platforms/trace/link1_avail.trace [moved from examples/simdag/link1_avail.trace with 100% similarity]
examples/platforms/two_hosts.xml [moved from examples/simdag/two_hosts.xml with 81% similarity]
examples/simdag/CMakeLists.txt
examples/simdag/dax/simple_dax_with_cycle.tesh
examples/simdag/dax/smalldax.tesh
examples/simdag/dot/test_simdag_dotload.tesh
examples/simdag/sd_fail.c
examples/simdag/test_simdag.in [deleted file]
examples/simdag/test_simdag2.tesh
examples/simdag/test_simdag_avail.tesh
examples/simdag/test_simdag_comm_throttling.tesh
examples/simdag/test_simdag_fail.tesh
examples/simdag/test_simdag_typed_tasks.tesh
tools/cmake/DefinePackages.cmake

similarity index 73%
rename from examples/simdag/faulty_host.xml
rename to examples/platforms/faulty_host.xml
index cbd5a03..8267e7f 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
 <AS  id="AS0"  routing="Full">
-  <host id="Faulty Host" speed="1Gf" state_file="faulty_host.trace"/>
+  <host id="Faulty Host" speed="1Gf" state_file="trace/faulty_host.trace"/>
   <host id="Safe Host" speed="500Mf"/>
 </AS>
 </platform>
similarity index 81%
rename from examples/simdag/two_hosts.xml
rename to examples/platforms/two_hosts.xml
index 025f900..6a7a389 100644 (file)
@@ -3,9 +3,9 @@
 <platform version="4">
   <AS id="AS0" routing="Full">
     <host id="Tremblay" speed="25Mf"/>
-    <host id="Jupiter" speed="25Mf" availability_file="jupiter_power.trace"/>
+    <host id="Jupiter" speed="25Mf" availability_file="trace/jupiter_speed.trace"/>
 
-    <link id="1" bandwidth="125MBps" latency="100us" bandwidth_file="link1_avail.trace"/>
+    <link id="1" bandwidth="125MBps" latency="100us" bandwidth_file="trace/link1_avail.trace"/>
 
     <route src="Tremblay" dst="Jupiter"><link_ctn id="1"/></route>
   </AS>
index 8fe6630..bd57c5b 100644 (file)
@@ -23,12 +23,6 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_avail.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail.tesh
   PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/2clusters.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/faulty_host.xml
-  PARENT_SCOPE)
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_avail.c
@@ -41,11 +35,4 @@ set(examples_src
 set(bin_files
   ${bin_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.in
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/faulty_host.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/jupiter_power.trace
-  ${CMAKE_CURRENT_SOURCE_DIR}/link1_avail.trace
   PARENT_SCOPE)
index 8617ae4..67216c9 100644 (file)
@@ -2,7 +2,7 @@
 p Test the DAX loader with a DAX comprising a cycle.
 
 ! expect return 255
-$ $SG_TEST_EXENV ./dax_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/simple_dax_with_cycle.xml
+$ $SG_TEST_EXENV ./dax_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/simple_dax_with_cycle.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle
index 48d4ed4..95f8fca 100644 (file)
@@ -1,7 +1,7 @@
 #! ./tesh
 p Test the DAX loader on a small DAX instance
 
-$ $SG_TEST_EXENV ${bindir:=.}/dax_test --log=no_loc ../2clusters.xml ./smalldax.xml
+$ $SG_TEST_EXENV ${bindir:=.}/dax_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ./smalldax.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] Ignore file o1 size redefinition from 1000000 to 304
 > [0.000000] [sd_daxparse/WARNING] Ignore file o2 size redefinition from 1000000 to 304
index 0b7166f..e454ff8 100644 (file)
@@ -1,7 +1,7 @@
 #! ./tesh
 p Test the loader of DAG written in the DOT format
 
-$ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag.dot
+$ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/dag.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
@@ -214,7 +214,7 @@ $ cat ${srcdir:=.}/dag.trace
 $ rm -f dag.trace
 
 ! expect return 2
-$ $SG_TEST_EXENV ./simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_bad_schedule.dot
+$ $SG_TEST_EXENV ./simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/dag_with_bad_schedule.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task 'end' can not be scheduled on -1 hosts
 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task '1' can not be scheduled on 0 hosts
@@ -224,7 +224,7 @@ $ $SG_TEST_EXENV ./simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose"
 > [0.000000] [sd_dotparse/WARNING] The scheduling is ignored
 > [0.000000] [test/CRITICAL] The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose
 
-$ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_good_schedule.dot
+$ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/dag_with_good_schedule.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
@@ -452,7 +452,7 @@ $ cat ${srcdir:=.}/dag_with_good_schedule.trace
 $ rm -f ${srcdir:=.}/dag_with_good_schedule.trace
 
 ! expect return 2
-$ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag_with_cycle.dot
+$ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/dag_with_cycle.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 0 is in a cycle
@@ -465,7 +465,7 @@ $ $SG_TEST_EXENV ./dot_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:
 > [0.000000] [sd_dotparse/ERROR] The DOT described in dag_with_cycle.dot is not a DAG. It contains a cycle.
 > [0.000000] [test/CRITICAL] No dot loaded. Do you have a cycle in your graph?
 
-$ $SG_TEST_EXENV ./ptg_test --log=no_loc ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/ptg.dot
+$ $SG_TEST_EXENV ./ptg_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/ptg.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
index 1abaeea..7620ea3 100644 (file)
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
   SD_init(&argc, argv);
 
   /* creation of the environment */
-  SD_create_environment("./faulty_host.xml");
+  SD_create_environment(argv[1]);
  
   /* creation of a single task that will poorly fail when the workstation
    * will stop */
diff --git a/examples/simdag/test_simdag.in b/examples/simdag/test_simdag.in
deleted file mode 100644 (file)
index d6e3291..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#! @BASH@ -e
-
-# Copyright (c) 2006, 2014. The SimGrid Team.
-# All rights reserved.
-
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the license (GNU LGPL) which comes with this package.
-
-if [ x@EXEEXT@ = x ] ; then 
-  exenv=$SG_TEST_EXENV
-else
-  exenv=wine
-fi
-    
-$exenv ./sd_test@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml $@
index fd8d8cb..64d0267 100644 (file)
@@ -2,6 +2,6 @@
 
 p Simple test of simdag
 
-$ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/2clusters.xml
+$ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/../platforms/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [3.251960] [sd_test/INFO] Simulation time: 3.251960
index 42e8ffd..ef1a13b 100644 (file)
@@ -2,7 +2,7 @@
 
 p Test of the management of availability traces with simdag
 
-$ $SG_TEST_EXENV ${bindir:=.}/sd_avail two_hosts.xml
+$ $SG_TEST_EXENV ${bindir:=.}/sd_avail ${srcdir:=.}/../platforms/two_hosts.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [1.000000] [sd_avail/INFO] link1: bw=125000000, lat=0.000100
 > [1.000000] [sd_avail/INFO] Jupiter: speed=12500000
index fe2dd56..e754362 100644 (file)
@@ -1,7 +1,7 @@
 #! ./tesh
 p Modify the rate of communication tasks even when they are auto-scheduled
 
-$ $SG_TEST_EXENV ./sd_comm_throttling --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/2clusters.xml
+$ $SG_TEST_EXENV ./sd_comm_throttling --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [1.000000] [sd_comm_throttling/INFO] Simulation stopped after 1.0000 seconds
index 2de13b3..3fa3c09 100644 (file)
@@ -2,7 +2,7 @@
 
 p Test of the management of failed tasks simdag
 
-$ $SG_TEST_EXENV ${bindir:=.}/sd_fail
+$ $SG_TEST_EXENV ${bindir:=.}/sd_fail ${srcdir:=.}/../platforms/faulty_host.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_fail/INFO] First test: COMP_SEQ task
 > [0.000000] [sd_fail/INFO] Schedule task 'Poor task' on 'Faulty Host'
index e9bc8fb..1435468 100644 (file)
@@ -1,7 +1,7 @@
 #! ./tesh
 p Usage test of simdag's typed tasks
 
-$ $SG_TEST_EXENV ./sd_typed_tasks_test --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/2clusters.xml
+$ $SG_TEST_EXENV ./sd_typed_tasks_test --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000
index e73d90a..ac0163d 100644 (file)
@@ -1192,6 +1192,7 @@ set(CMAKE_SOURCE_FILES
   )
 
 set(PLATFORMS_EXAMPLES
+  examples/platforms/2clusters.xml
   examples/platforms/bypassASroute.xml
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
@@ -1206,12 +1207,16 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
+  examples/platforms/trace/faulty_host.trace
+  examples/platforms/trace/jupiter_speed.trace
+  examples/platforms/trace/link1_avail.trace
   examples/platforms/trace/linkBandwidth7.bw
   examples/platforms/trace/trace_A_failure.txt
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/energy_platform.xml
+  examples/platforms/faulty_host.xml
   examples/platforms/fat_tree_cluster.xml
   examples/platforms/g5k.xml
   examples/platforms/griffon.xml
@@ -1243,6 +1248,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/syscoord/median_p2psim.xml
   examples/platforms/torus_cluster.xml
+  examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform.xml
   examples/platforms/two_hosts_platform_shared.xml
   examples/platforms/two_hosts_platform_with_availability.xml