A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'torus'
[simgrid.git]
/
buildtools
/
Cmake
/
DefinePackages.cmake
diff --git
a/buildtools/Cmake/DefinePackages.cmake
b/buildtools/Cmake/DefinePackages.cmake
index
3902cd1
..
980f973
100644
(file)
--- a/
buildtools/Cmake/DefinePackages.cmake
+++ b/
buildtools/Cmake/DefinePackages.cmake
@@
-35,24
+35,23
@@
set(EXTRA_DIST
src/simix/smx_smurf_private.h
src/simix/smx_synchro_private.h
src/smpi/README
src/simix/smx_smurf_private.h
src/simix/smx_synchro_private.h
src/smpi/README
- src/smpi/colls/COPYRIGHTS
src/smpi/colls/colls.h
src/smpi/colls/colls_private.h
src/smpi/colls/coll_tuned_topo.h
src/smpi/private.h
src/smpi/smpi_mpi_dt_private.h
src/smpi/colls/colls.h
src/smpi/colls/colls_private.h
src/smpi/colls/coll_tuned_topo.h
src/smpi/private.h
src/smpi/smpi_mpi_dt_private.h
- src/surf/cpu.hpp
+ src/surf/plugins/energy.hpp
+ src/surf/cpu_interface.hpp
src/surf/cpu_ti.hpp
src/surf/cpu_cas01.hpp
src/surf/cpu_ti.hpp
src/surf/cpu_cas01.hpp
- src/surf/cpu_ti_private.h
src/surf/gtnets/gtnets_interface.h
src/surf/gtnets/gtnets_simulator.h
src/surf/gtnets/gtnets_topology.h
src/surf/gtnets/gtnets_interface.h
src/surf/gtnets/gtnets_simulator.h
src/surf/gtnets/gtnets_topology.h
- src/surf/maxmin_private.h
+ src/surf/maxmin_private.hpp
+ src/surf/network_interface.hpp
src/surf/network_gtnets.hpp
src/surf/network_ns3_private.h
src/surf/network_gtnets.hpp
src/surf/network_ns3_private.h
- src/surf/network_private.h
- src/surf/network.hpp
+ src/surf/network_cm02.hpp
src/surf/network_smpi.hpp
src/surf/network_constant.hpp
src/surf/ns3/my-point-to-point-helper.h
src/surf/network_smpi.hpp
src/surf/network_constant.hpp
src/surf/ns3/my-point-to-point-helper.h
@@
-62,14
+61,14
@@
set(EXTRA_DIST
src/surf/platf_generator_private.h
src/surf/simgrid.dtd
src/surf/simgrid_dtd.c
src/surf/platf_generator_private.h
src/surf/simgrid.dtd
src/surf/simgrid_dtd.c
- src/surf/storage.hpp
- src/surf/storage_
private.h
- src/surf/surf.hpp
+ src/surf/storage
_interface
.hpp
+ src/surf/storage_
n11.hpp
+ src/surf/surf
_interface
.hpp
src/surf/surf_private.h
src/surf/surf_private.h
- src/surf/surf_routing_private.h
src/surf/surf_routing_private.hpp
src/surf/surf_routing.hpp
src/surf/surf_routing_cluster.hpp
src/surf/surf_routing_private.hpp
src/surf/surf_routing.hpp
src/surf/surf_routing_cluster.hpp
+ src/surf/surf_routing_cluster_torus.hpp
src/surf/surf_routing_dijkstra.hpp
src/surf/surf_routing_floyd.hpp
src/surf/surf_routing_full.hpp
src/surf/surf_routing_dijkstra.hpp
src/surf/surf_routing_floyd.hpp
src/surf/surf_routing_full.hpp
@@
-78,7
+77,10
@@
set(EXTRA_DIST
src/surf/surf_routing_vivaldi.hpp
src/surf/surfxml_parse.c
src/surf/trace_mgr_private.h
src/surf/surf_routing_vivaldi.hpp
src/surf/surfxml_parse.c
src/surf/trace_mgr_private.h
- src/surf/workstation.hpp
+ src/surf/vm_workstation_interface.hpp
+ src/surf/vm_workstation_hl13.hpp
+ src/surf/workstation_interface.hpp
+ src/surf/workstation_clm03.hpp
src/surf/workstation_ptask_L07.hpp
src/win32/config.h
src/xbt/automaton/automaton_lexer.yy.c
src/surf/workstation_ptask_L07.hpp
src/win32/config.h
src/xbt/automaton/automaton_lexer.yy.c
@@
-124,6
+126,7
@@
set(SMPI_SRC
src/smpi/smpi_c99.c
src/smpi/smpi_coll.c
src/smpi/smpi_comm.c
src/smpi/smpi_c99.c
src/smpi/smpi_coll.c
src/smpi/smpi_comm.c
+ src/smpi/smpi_dvfs.c
src/smpi/smpi_global.c
src/smpi/smpi_group.c
src/smpi/smpi_mpi.c
src/smpi/smpi_global.c
src/smpi/smpi_group.c
src/smpi/smpi_mpi.c
@@
-298,25
+301,29
@@
set(NS3_SRC
)
set(SURF_SRC
)
set(SURF_SRC
- src/surf/cpu.cpp
+ src/surf/plugins/energy.cpp
+ src/surf/cpu_interface.cpp
src/surf/cpu_ti.cpp
src/surf/cpu_cas01.cpp
src/surf/cpu_ti.cpp
src/surf/cpu_cas01.cpp
- src/surf/fair_bottleneck.c
+ src/surf/fair_bottleneck.c
pp
src/surf/instr_routing.c
src/surf/instr_surf.c
src/surf/instr_routing.c
src/surf/instr_surf.c
- src/surf/lagrange.c
- src/surf/maxmin.c
- src/surf/network.cpp
+ src/surf/lagrange.cpp
+ src/surf/maxmin.cpp
+ src/surf/network_interface.cpp
+ src/surf/network_cm02.cpp
src/surf/network_smpi.cpp
src/surf/network_constant.cpp
src/surf/platf_generator.c
src/surf/random_mgr.c
src/surf/sg_platf.c
src/surf/network_smpi.cpp
src/surf/network_constant.cpp
src/surf/platf_generator.c
src/surf/random_mgr.c
src/surf/sg_platf.c
- src/surf/storage.cpp
- src/surf/s
urf
.cpp
+ src/surf/storage
_interface
.cpp
+ src/surf/s
torage_n11
.cpp
src/surf/surf_interface.cpp
src/surf/surf_interface.cpp
+ src/surf/surf_c_bindings.cpp
src/surf/surf_routing.cpp
src/surf/surf_routing_cluster.cpp
src/surf/surf_routing.cpp
src/surf/surf_routing_cluster.cpp
+ src/surf/surf_routing_cluster_torus.cpp
src/surf/surf_routing_dijkstra.cpp
src/surf/surf_routing_floyd.cpp
src/surf/surf_routing_full.cpp
src/surf/surf_routing_dijkstra.cpp
src/surf/surf_routing_floyd.cpp
src/surf/surf_routing_full.cpp
@@
-326,9
+333,11
@@
set(SURF_SRC
src/surf/surfxml_parse.c
src/surf/surfxml_parseplatf.c
src/surf/trace_mgr.c
src/surf/surfxml_parse.c
src/surf/surfxml_parseplatf.c
src/surf/trace_mgr.c
- src/surf/workstation.cpp
+ src/surf/workstation_interface.cpp
+ src/surf/workstation_clm03.cpp
src/surf/workstation_ptask_L07.cpp
src/surf/workstation_ptask_L07.cpp
- src/surf/vm_workstation.cpp
+ src/surf/vm_workstation_interface.cpp
+ src/surf/vm_workstation_hl13.cpp
src/xbt/xbt_sg_stubs.c
)
src/xbt/xbt_sg_stubs.c
)
@@
-499,7
+508,9
@@
set(TRACING_SRC
src/instr/instr_config.c
src/instr/instr_interface.c
src/instr/instr_paje_containers.c
src/instr/instr_config.c
src/instr/instr_interface.c
src/instr/instr_paje_containers.c
+ src/instr/instr_TI_trace.c
src/instr/instr_paje_trace.c
src/instr/instr_paje_trace.c
+ src/instr/instr_trace.c
src/instr/instr_paje_header.c
src/instr/instr_paje_types.c
src/instr/instr_paje_values.c
src/instr/instr_paje_header.c
src/instr/instr_paje_types.c
src/instr/instr_paje_values.c
@@
-533,14
+544,17
@@
set(MC_SRC
)
set(headers_to_install
)
set(headers_to_install
+ include/simgrid.h
include/instr/instr.h
include/msg/datatypes.h
include/msg/msg.h
include/simdag/datatypes.h
include/simdag/simdag.h
include/instr/instr.h
include/msg/datatypes.h
include/msg/msg.h
include/simdag/datatypes.h
include/simdag/simdag.h
+ include/simgrid/datatypes.h
include/simgrid/modelchecker.h
include/simgrid/platf.h
include/simgrid/platf_generator.h
include/simgrid/modelchecker.h
include/simgrid/platf.h
include/simgrid/platf_generator.h
+ include/simgrid/plugins.h
include/simgrid/simix.h
include/smpi/mpi.h
include/smpi/smpi.h
include/simgrid/simix.h
include/smpi/mpi.h
include/smpi/smpi.h
@@
-827,6
+841,7
@@
set(bin_files
src/smpi/smpiff.in
src/smpi/smpif90.in
src/smpi/smpirun.in
src/smpi/smpiff.in
src/smpi/smpif90.in
src/smpi/smpirun.in
+ src/smpi/smpitools.sh
)
set(txt_files
)
set(txt_files
@@
-907,6
+922,9
@@
set(EXAMPLES_CMAKEFILES_TXT
examples/simdag/scheduling/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/smpi/MM/CMakeLists.txt
examples/simdag/scheduling/CMakeLists.txt
examples/smpi/CMakeLists.txt
examples/smpi/MM/CMakeLists.txt
+ examples/smpi/energy/CMakeLists.txt
+ examples/smpi/energy/f77/CMakeLists.txt
+ examples/smpi/energy/f90/CMakeLists.txt
examples/xbt/CMakeLists.txt
)
examples/xbt/CMakeLists.txt
)
@@
-931,6
+949,7
@@
set(TESHSUITE_CMAKEFILES_TXT
teshsuite/smpi/mpich3-test/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
+ teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
# teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
# teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
@@
-938,6
+957,7
@@
set(TESHSUITE_CMAKEFILES_TXT
teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+ teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
@@
-973,8
+993,10
@@
set(CMAKE_SOURCE_FILES
buildtools/Cmake/MakeLib.cmake
buildtools/Cmake/MakeLibWin.cmake
buildtools/Cmake/Modules/FindF2c.cmake
buildtools/Cmake/MakeLib.cmake
buildtools/Cmake/MakeLibWin.cmake
buildtools/Cmake/Modules/FindF2c.cmake
+ buildtools/Cmake/Modules/FindGFortran.cmake
buildtools/Cmake/Modules/FindGTnets.cmake
buildtools/Cmake/Modules/FindGraphviz.cmake
buildtools/Cmake/Modules/FindGTnets.cmake
buildtools/Cmake/Modules/FindGraphviz.cmake
+ buildtools/Cmake/Modules/FindLibSigc++.cmake
buildtools/Cmake/Modules/FindLibunwind.cmake
buildtools/Cmake/Modules/FindLua51Simgrid.cmake
buildtools/Cmake/Modules/FindNS3.cmake
buildtools/Cmake/Modules/FindLibunwind.cmake
buildtools/Cmake/Modules/FindLua51Simgrid.cmake
buildtools/Cmake/Modules/FindNS3.cmake
@@
-1029,6
+1051,7
@@
set(PLATFORMS_EXAMPLES
examples/platforms/conf/lcg_sept2004_grid.xml
examples/platforms/conf/transform_optorsim_platform.pl
examples/platforms/config.xml
examples/platforms/conf/lcg_sept2004_grid.xml
examples/platforms/conf/transform_optorsim_platform.pl
examples/platforms/config.xml
+ examples/platforms/content/small_content.txt
examples/platforms/content/storage_content.txt
examples/platforms/content/win_storage_content.txt
examples/platforms/data_center.xml
examples/platforms/content/storage_content.txt
examples/platforms/content/win_storage_content.txt
examples/platforms/data_center.xml