reorganize examples/msg/energy

 Note the parallel_task_energy tests included the parallel_task test,
 then keep the energy one only and rename it.

diff --git a/.gitignore b/.gitignore
index ff4d9ff..c3266db 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -131,11 +131,11 @@ examples/msg/cloud/multicore
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm

-examples/msg/energy/consumption/consumption
-examples/msg/energy/onoff/onoff
-examples/msg/energy/pstate/pstate
-examples/msg/energy/vm/vm
-examples/msg/gpu/test_MSG_gpu_task_create
+examples/msg/energy-consumption/energy-consumption
+examples/msg/energy-onoff/energy-onoff
+examples/msg/energy-pstate/energy-pstate
+examples/msg/energy-ptask/energy-ptask
+examples/msg/energy-vm/energy-vm

 examples/msg/gtnets/gtnets
 examples/msg/icomms/.kdbgrc.peer3
 examples/msg/icomms/peer
 examples/msg/gtnets/gtnets
 examples/msg/icomms/.kdbgrc.peer3
 examples/msg/icomms/peer


@@ -174,9 +174,6 @@ examples/msg/mc/test/snapshot_comparison5
 examples/msg/migration/migration
 examples/msg/ms.trace
 examples/msg/ns3/ns3
 examples/msg/migration/migration
 examples/msg/ms.trace
 examples/msg/ns3/ns3

-examples/msg/parallel_contexts/pcontexts
-examples/msg/parallel_contexts/pcontexts2
-examples/msg/parallel_task/parallel_task

 examples/msg/dht-pastry/pastry
 examples/msg/pmm/pmm
 examples/msg/priority/priority
 examples/msg/dht-pastry/pastry
 examples/msg/pmm/pmm
 examples/msg/priority/priority

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index a76e30b..e1baea3 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,4 +1,5 @@
-foreach(x dht-chord exception migration parallel_task pmm priority properties suspend synchro token_ring)
+foreach(x dht-chord exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm 
+          migration pmm priority properties suspend synchro token_ring)

   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})


@@ -10,13 +11,13 @@ foreach(file bourassa fafard ginette jupiter link3 link4 link5)
   set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}_state.trace)
 endforeach()
 
   set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}_state.trace)
 endforeach()
 

-set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README                       PARENT_SCOPE)
-set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py            PARENT_SCOPE)
-set(examples_src ${examples_src}                                                           PARENT_SCOPE)
-set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/dht-chord_crosstraffic.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task/parallel_task_energy.tesh      PARENT_SCOPE)
+set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README                                       PARENT_SCOPE)
+set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py                        PARENT_SCOPE)
+set(examples_src ${examples_src}                                                                           PARENT_SCOPE)
+set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/dht-chord_crosstraffic.tesh        PARENT_SCOPE)

 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord10.xml
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/chord10.xml

+                                  ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml

                                   ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml                  PARENT_SCOPE)
 
                                   ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml                  PARENT_SCOPE)
 


@@ -24,11 +25,16 @@ foreach(x dht-chord migration priority properties suspend synchro token_ring)
   ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
 endforeach()
 
   ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
 endforeach()
 

+foreach (example consumption onoff pstate vm)
+  ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
+endforeach()
+

 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic          "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-parallel              "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic          "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-crosstraffic-parallel "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord_crosstraffic.tesh)
 ADD_TESH_FACTORIES(msg-dht-chord-parallel              "thread;ucontext;raw" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-chord --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-chord dht-chord.tesh)

-ADD_TESH_FACTORIES(msg-ptask                       "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
-ADD_TESH_FACTORIES(msg-ptask-energy                "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task_energy.tesh)
+ADD_TESH_FACTORIES(msg-energy-pstate-ptask             "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh)
+ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh)
+ADD_TESH_FACTORIES(msg-energy-ptask                    "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-ptask/energy-ptask.tesh)

 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 # This one is not usable:
 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 # This one is not usable:

diff --git a/examples/msg/energy/consumption/consumption.c b/examples/msg/energy-consumption/energy-consumption.c
similarity index 100%
rename from examples/msg/energy/consumption/consumption.c
rename to examples/msg/energy-consumption/energy-consumption.c

diff --git a/examples/msg/energy/consumption/consumption.tesh b/examples/msg/energy-consumption/energy-consumption.tesh
similarity index 91%
rename from examples/msg/energy/consumption/consumption.tesh
rename to examples/msg/energy-consumption/energy-consumption.tesh
index 4fca5e9..20d6c71 100644 (file)
--- a/examples/msg/energy/consumption/consumption.tesh
+++ b/examples/msg/energy-consumption/energy-consumption.tesh
@@ -2,7 +2,7 @@
 
 p Testing the mechanism for computing host energy consumption
 
 
 p Testing the mechanism for computing host energy consumption
 

-$ $SG_TEST_EXENV energy/consumption/consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy-consumption/energy-consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:200.0, 93.0:170.0, 90.0:150.0
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds
 > [  0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:200.0, 93.0:170.0, 90.0:150.0
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds

diff --git a/examples/msg/energy/onoff/onoff.c b/examples/msg/energy-onoff/energy-onoff.c
similarity index 100%
rename from examples/msg/energy/onoff/onoff.c
rename to examples/msg/energy-onoff/energy-onoff.c

diff --git a/examples/msg/energy/onoff/onoff.tesh b/examples/msg/energy-onoff/energy-onoff.tesh
similarity index 93%
rename from examples/msg/energy/onoff/onoff.tesh
rename to examples/msg/energy-onoff/energy-onoff.tesh
index 34276aa..9f7407c 100644 (file)
--- a/examples/msg/energy/onoff/onoff.tesh
+++ b/examples/msg/energy-onoff/energy-onoff.tesh
@@ -3,7 +3,7 @@
 p Testing the mechanism for computing host energy consumption
 
 ! output sort 19
 p Testing the mechanism for computing host energy consumption
 
 ! output sort 19

-$ $SG_TEST_EXENV energy/onoff/onoff$EXEEXT ${srcdir:=.}/energy/onoff/platform_onoff.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy-onoff/energy-onoff$EXEEXT ${srcdir:=.}/energy-onoff/platform_onoff.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:onoff_test@MyHost2) Energetic profile: 95.0:200.0,93.0:170.0,90.0:150.0,       120:120,110:110
 > [  0.000000] (1:onoff_test@MyHost2) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:onoff_test@MyHost2) Sleep for 10 seconds
 > [  0.000000] (1:onoff_test@MyHost2) Energetic profile: 95.0:200.0,93.0:170.0,90.0:150.0,       120:120,110:110
 > [  0.000000] (1:onoff_test@MyHost2) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:onoff_test@MyHost2) Sleep for 10 seconds

diff --git a/examples/msg/energy/onoff/platform_onoff.xml b/examples/msg/energy-onoff/platform_onoff.xml
similarity index 100%
rename from examples/msg/energy/onoff/platform_onoff.xml
rename to examples/msg/energy-onoff/platform_onoff.xml

diff --git a/examples/msg/energy/pstate/pstate.c b/examples/msg/energy-pstate/energy-pstate.c
similarity index 100%
rename from examples/msg/energy/pstate/pstate.c
rename to examples/msg/energy-pstate/energy-pstate.c

diff --git a/examples/msg/energy/pstate/pstate.tesh b/examples/msg/energy-pstate/energy-pstate.tesh
similarity index 90%
rename from examples/msg/energy/pstate/pstate.tesh
rename to examples/msg/energy-pstate/energy-pstate.tesh
index f8b733a..82989e2 100644 (file)
--- a/examples/msg/energy/pstate/pstate.tesh
+++ b/examples/msg/energy-pstate/energy-pstate.tesh
@@ -2,7 +2,7 @@
 
 p Testing the DVFS-related functions
 
 
 p Testing the DVFS-related functions
 

-$ $SG_TEST_EXENV energy/pstate/pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy-pstate/energy-pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
 > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000

diff --git a/examples/msg/parallel_task/parallel_task.c b/examples/msg/energy-ptask/energy-ptask.c
similarity index 100%
rename from examples/msg/parallel_task/parallel_task.c
rename to examples/msg/energy-ptask/energy-ptask.c

diff --git a/examples/msg/parallel_task/parallel_task_energy.tesh b/examples/msg/energy-ptask/energy-ptask.tesh
similarity index 84%
rename from examples/msg/parallel_task/parallel_task_energy.tesh
rename to examples/msg/energy-ptask/energy-ptask.tesh
index d0d2d91..80ed175 100644 (file)
--- a/examples/msg/parallel_task/parallel_task_energy.tesh
+++ b/examples/msg/energy-ptask/energy-ptask.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
 #! ./tesh
 

-$ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy-ptask/energy-ptask$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
 > [  0.000000] (1:test@MyHost1) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair
 > [300.000000] (1:test@MyHost1) Then, build a parallel task involving only computations and no communication (1 Gflop per node)
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
 > [  0.000000] (1:test@MyHost1) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair
 > [300.000000] (1:test@MyHost1) Then, build a parallel task involving only computations and no communication (1 Gflop per node)

diff --git a/examples/msg/energy/vm/.gitignore b/examples/msg/energy-vm/.gitignore
similarity index 100%
rename from examples/msg/energy/vm/.gitignore
rename to examples/msg/energy-vm/.gitignore

diff --git a/examples/msg/energy/vm/vm.c b/examples/msg/energy-vm/energy-vm.c
similarity index 100%
rename from examples/msg/energy/vm/vm.c
rename to examples/msg/energy-vm/energy-vm.c

diff --git a/examples/msg/energy/vm/vm.tesh b/examples/msg/energy-vm/energy-vm.tesh
similarity index 90%
rename from examples/msg/energy/vm/vm.tesh
rename to examples/msg/energy-vm/energy-vm.tesh
index c8fbf19..314ce3a 100644 (file)
--- a/examples/msg/energy/vm/vm.tesh
+++ b/examples/msg/energy-vm/energy-vm.tesh
@@ -2,7 +2,7 @@
 
 p Testing the mechanism for computing host energy consumption in case of VMs
 
 
 p Testing the mechanism for computing host energy consumption in case of VMs
 

-$ $SG_TEST_EXENV energy/vm/vm$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy-vm/energy-vm$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:dvfs@MyHost1) Creating and starting two VMs
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: one inside a VM, the other directly on the host
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: both directly on the host
 > [  0.000000] (1:dvfs@MyHost1) Creating and starting two VMs
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host1: one inside a VM, the other directly on the host
 > [  0.000000] (1:dvfs@MyHost1) Create two tasks on Host2: both directly on the host

diff --git a/examples/msg/energy/CMakeLists.txt b/examples/msg/energy/CMakeLists.txt
deleted file mode 100644 (file)
index fb8f9df..0000000
--- a/examples/msg/energy/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-foreach (example consumption onoff pstate vm)
-  add_executable       (${example}  ${example}/${example}.c)
-  target_link_libraries(${example}  simgrid)
-  set_target_properties(${example}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example})
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh)
-  set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.c)
-  ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/${example}/${example}.tesh)
-endforeach()
-
-ADD_TESH_FACTORIES(msg-ptask-energy-pstates     "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/pstate/pstate.tesh)
-ADD_TESH_FACTORIES(msg-ptask-energy-consumption "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/consumption/consumption.tesh)
-
-set(examples_src  ${examples_src}                                                                        PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                                          PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/onoff/platform_onoff.xml                  PARENT_SCOPE)

diff --git a/examples/msg/parallel_task/parallel_task.tesh b/examples/msg/parallel_task/parallel_task.tesh
deleted file mode 100644 (file)
index 1f60947..0000000
--- a/examples/msg/parallel_task/parallel_task.tesh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! ./tesh
-
-$ $SG_TEST_EXENV parallel_task/parallel_task$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> [  0.000000] (1:test@Fafard) First, build a classical parallel task, with 1 Gflop to execute on each node, and 10MB to exchange between each pair
-> [ 20.625396] (1:test@Fafard) Then, build a parallel task involving only computations and no communication (1 Gflop per node)
-> [ 41.247354] (1:test@Fafard) Finally, trick the ptask to do a 'remote execution', on host Tremblay
-> [ 51.441554] (1:test@Fafard) Goodbye now!
-> [ 51.441554] (0:maestro@) Simulation done.

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index bb79408..53c9499 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -954,7 +954,6 @@ set(CMAKEFILES_TXT
     examples/msg/cloud/CMakeLists.txt
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/dht-pastry/CMakeLists.txt
     examples/msg/cloud/CMakeLists.txt
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/dht-pastry/CMakeLists.txt

-    examples/msg/energy/CMakeLists.txt

     examples/msg/gtnets/CMakeLists.txt 
     examples/msg/icomms/CMakeLists.txt
     examples/msg/io/CMakeLists.txt
     examples/msg/gtnets/CMakeLists.txt 
     examples/msg/icomms/CMakeLists.txt
     examples/msg/io/CMakeLists.txt