Commit e2ded66e authored by mubarak's avatar mubarak

Merging the Makefile to resolve conflict

parents d324b101 2fea9e0a
......@@ -38,18 +38,25 @@ src_libcodes_net_a_SOURCES = \
src/models/networks/model-net/model-net-sched-impl.h \
src/models/networks/model-net/model-net-sched-impl.c \
src/models/mpi-trace-replay/model-net-mpi-wrklds.c \
src/models/mpi-trace-replay/model-net-synthetic.c
src/models/mpi-trace-replay/model-net-synthetic.c \
src/models/mpi-trace-replay/model-net-dumpi-traces-dump.c
bin_PROGRAMS += src/models/mpi-trace-replay/model-net-mpi-wrklds
bin_PROGRAMS += src/models/mpi-trace-replay/model-net-dumpi-traces-dump
bin_PROGRAMS += src/models/mpi-trace-replay/model-net-synthetic
src_models_mpi_trace_replay_model_net_mpi_wrklds_SOURCES = src/models/mpi-trace-replay/model-net-mpi-wrklds.c
src_models_mpi_trace_replay_model_net_mpi_wrklds_LDADD = $(testlib) $(CODES_BASE_LIBS)
src_models_mpi_trace_replay_model_net_mpi_wrklds_LDFLAGS = $(CODES_BASE_LDFLAGS)
src_models_mpi_trace_replay_model_net_mpi_wrklds_CFLAGS = ${CODES_BASE_CFLAGS}
bin_PROGRAMS += src/models/mpi-trace-replay/model-net-synthetic
src_models_mpi_trace_replay_model_net_synthetic_SOURCES = src/models/mpi-trace-replay/model-net-synthetic.c
src_models_mpi_trace_replay_model_net_synthetic_LDADD = $(testlib) $(CODES_BASE_LIBS)
src_models_mpi_trace_replay_model_net_synthetic_LDFLAGS = $(CODES_BASE_LDFLAGS)
src_models_mpi_trace_replay_model_net_synthetic_CFLAGS = ${CODES_BASE_CFLAGS}
src_models_mpi_trace_replay_model_net_dumpi_traces_dump_SOURCES = src/models/mpi-trace-replay/model-net-dumpi-traces-dump.c
src_models_mpi_trace_replay_model_net_dumpi_traces_dump_LDADD = $(testlib) $(CODES_BASE_LIBS)
src_models_mpi_trace_replay_model_net_dumpi_traces_dump_LDFLAGS = $(CODES_BASE_LDFLAGS)
src_models_mpi_trace_replay_model_net_dumpi_traces_dump_CFLAGS = ${CODES_BASE_CFLAGS}
......@@ -2,26 +2,44 @@
instructions available at:
http://sst.sandia.gov/about_dumpi.html
Configure dumpi with the following parameters:
../configure --enable-libdumpi --enable-test --disable-shared --prefix=/home/mubarm/dumpi/dumpi/install CC=mpicc CXX=mpicxx
2- Configure codes-base with DUMPI. Make sure the CC environment variable
refers to a MPI compiler
./configure --with-ross=/path/to/ross/install --with-dumpi=/path/to/dumpi/install
--prefix=/path/to/codes-base/install CC=mpicc
3- Build codes-base
3- Build codes-base (See codes-base INSTALL for instructions on building codes-base with dumpi)
make clean && make && make install
4- Configure and build codes-net (See README.txt for instructions on building codes-net).
4- Configure and build codes-net (See INSTALL for instructions on building codes-net).
5- Download and untar the design forward DUMPI traces from URL
http://portal.nersc.gov/project/CAL/designforward.htm
6- Configure model-net using its config file (Example .conf files available at src/models/mpi-trace-replay/)
----------------- RUNNING CODES NETWORK WORKLOAD TEST PROGRAM -----------------------
6- Download and untar the DUMPI AMG application trace for 27 MPI ranks using the following download link:
wget http://portal.nersc.gov/project/CAL/doe-miniapps-mpi-traces/AMG/df_AMG_n27_dumpi.tar.gz
7- Run the test program for codes-nw-workload using.
mpirun -np 4 ./src/models/mpi-trace-replay/model-net-dumpi-traces-dump --sync=3 --workload_type=dumpi --workload_file=/home/mubarm/df_traces/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- ../src/models/mpi-trace-replay/conf/modelnet-mpi-test.conf
The program shows the number of sends, receives, collectives and wait operations in the DUMPI trace log.
Note: If using a different DUMPI trace file, make sure to update the modelnet-mpi-test.conf file in the config directory.
----------------- RUNNING MODEL-NET WITH CODES NW WORKLOADS -----------------------------
8- Configure model-net using its config file (Example .conf files available at src/models/mpi-trace-replay/)
Make sure the number of nw-lp and model-net LP are the same in the config file.
7- From the main source directory of codes-net, run the DUMPI trace replay simulation on top of
9- From the main source directory of codes-net, run the DUMPI trace replay simulation on top of
model-net using (/dumpi-2014-04-05.22.12.17.37- is the prefix of the all DUMPI trace files.
We skip the last 4 digit prefix of the DUMPI trace file names).
......@@ -29,7 +47,7 @@
The simulation runs in ROSS serial, conservative and optimistic modes.
8- Some example runs with small-scale traces
10- Some example runs with small-scale traces
(i) AMG 8 MPI tasks http://portal.nersc.gov/project/CAL/designforward.htm#AMG
......
......@@ -2,7 +2,7 @@ LPGROUPS
{
MODELNET_GRP
{
repetitions="18";
repetitions="2048";
nw-lp="1";
modelnet_torus="1";
}
......@@ -10,15 +10,15 @@ LPGROUPS
PARAMS
{
packet_size="512";
message_size="296";
message_size="336";
modelnet_order=( "torus" );
# scheduler options
modelnet_scheduler="fcfs";
net_startup_ns="1.5";
net_bw_mbps="20000";
n_dims="3";
dim_length="3,3,2";
link_bandwidth="2.0";
n_dims="5";
dim_length="8,4,4,4,4";
link_bandwidth="10.0";
buffer_size="1310720";
num_vc="1";
chunk_size="64";
......
......@@ -2,15 +2,14 @@ LPGROUPS
{
MODELNET_GRP
{
repetitions="8";
repetitions="27";
nw-lp="1";
modelnet_simplenet="1";
}
}
PARAMS
{
packet_size="512";
message_size="296";
message_size="784";
modelnet_order=( "simplenet" );
# scheduler options
modelnet_scheduler="fcfs";
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment