Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
codes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
38
Issues
38
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
codes
codes
Commits
62564150
Commit
62564150
authored
Oct 07, 2016
by
Misbah Mubarak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modifications to custom-dragonfly: updating header files, changing variable names in the model
parent
0ddc2e4d
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
128 additions
and
129 deletions
+128
-129
Makefile.am
Makefile.am
+5
-5
dragonfly-custom.h
codes/net/dragonfly-custom.h
+6
-4
configure.ac
configure.ac
+1
-1
Makefile.subdir
src/Makefile.subdir
+8
-11
dragonfly-custom.C
src/networks/model-net/dragonfly-custom.C
+108
-108
No files found.
Makefile.am
View file @
62564150
...
...
@@ -5,7 +5,7 @@ bin_PROGRAMS =
bin_SCRIPTS
=
noinst_LIBRARIES
=
noinst_PROGRAMS
=
lib_LIBRARIES
=
lib_L
TL
IBRARIES
=
noinst_HEADERS
=
TESTS
=
check_PROGRAMS
=
...
...
@@ -30,7 +30,7 @@ AM_CFLAGS =
AM_CXXFLAGS
=
$(AM_CFLAGS)
LDADD
=
$(lib_LIBRARIES)
$(ROSS_LIBS)
LDADD
=
$(lib_L
TL
IBRARIES)
$(ROSS_LIBS)
include
Make.rules
...
...
@@ -41,18 +41,18 @@ include $(top_srcdir)/doc/Makefile.subdir
if
USE_DARSHAN
AM_CPPFLAGS
+=
${
DARSHAN_CFLAGS
}
-DUSE_DARSHAN
=
1
src_libcodes_a_SOURCES
+=
src/workload/methods/codes-darshan-io-wrkld.c
src_libcodes_
l
a_SOURCES
+=
src/workload/methods/codes-darshan-io-wrkld.c
LDADD
+=
${
DARSHAN_LIBS
}
TESTS
+=
tests/workload/darshan-dump.sh
endif
if
USE_RECORDER
AM_CPPFLAGS
+=
${
RECORDER_CPPFLAGS
}
src_libcodes_a_SOURCES
+=
src/workload/methods/codes-recorder-io-wrkld.c
src_libcodes_
l
a_SOURCES
+=
src/workload/methods/codes-recorder-io-wrkld.c
endif
if
USE_DUMPI
AM_CPPFLAGS
+=
${
DUMPI_CFLAGS
}
-DUSE_DUMPI
=
1
src_libcodes_a_SOURCES
+=
src/workload/methods/codes-dumpi-trace-nw-wrkld.c
src_libcodes_
l
a_SOURCES
+=
src/workload/methods/codes-dumpi-trace-nw-wrkld.c
LDADD
+=
${
DUMPI_LIBS
}
endif
codes/net/dragonfly-custom.h
View file @
62564150
...
...
@@ -4,8 +4,8 @@
*
*/
#ifndef DRAGONFLY_H
#define DRAGONFLY_H
#ifndef DRAGONFLY_
CUSTOM_
H
#define DRAGONFLY_
CUSTOM_
H
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -13,10 +13,10 @@ extern "C" {
#include <ross.h>
typedef
struct
terminal_
message
terminal
_message
;
typedef
struct
terminal_
custom_message
terminal_custom
_message
;
/* this message is used for both dragonfly compute nodes and routers */
struct
terminal_message
struct
terminal_
custom_
message
{
/* magic number */
int
magic
;
...
...
@@ -49,6 +49,8 @@ struct terminal_message
short
saved_channel
;
short
saved_vc
;
int
next_stop
;
short
nonmin_done
;
/* Intermediate LP ID from which this message is coming */
unsigned
int
intm_lp_id
;
...
...
configure.ac
View file @
62564150
...
...
@@ -3,6 +3,7 @@
AC_PREREQ([2.67])
AC_INIT([codes], [0.5.2], [http://trac.mcs.anl.gov/projects/codes/newticket],[],[http://www.mcs.anl.gov/projects/codes/])
LT_INIT
AC_CANONICAL_TARGET
AC_CANONICAL_SYSTEM
...
...
@@ -25,7 +26,6 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_CXXCPP
AC_PROG_RANLIB
PKG_PROG_PKG_CONFIG
...
...
src/Makefile.subdir
View file @
62564150
lib_L
IBRARIES
+=
src/libcodes.
a
lib_L
TLIBRARIES
+=
src/libcodes.l
a
BUILT_SOURCES
+=
src/modelconfig/configparser.h
\
src/modelconfig/configlex.h
...
...
@@ -98,7 +98,7 @@ nobase_include_HEADERS = \
#codes/codes-nw-workload.h
src_libcodes_a_SOURCES
=
\
src_libcodes_
l
a_SOURCES
=
\
src/iokernellang/codesparser.h
\
src/iokernellang/codesparser.c
\
src/iokernellang/codeslexer.h
\
...
...
@@ -155,11 +155,7 @@ src_libcodes_a_SOURCES = \
src/networks/model-net/model-net-lp.c
\
src/networks/model-net/model-net-sched.c
\
src/networks/model-net/model-net-sched-impl.h
\
src/networks/model-net/model-net-sched-impl.c
\
src/network-workloads/model-net-mpi-replay.c
\
src/network-workloads/model-net-synthetic.c
\
src/network-workloads/model-net-synthetic-slimfly.c
\
src/network-workloads/model-net-dumpi-traces-dump.c
src/networks/model-net/model-net-sched-impl.c
#codes/codes-nw-workload.h
...
...
@@ -184,10 +180,11 @@ bin_PROGRAMS += src/network-workloads/model-net-synthetic-slimfly
src_workload_codes_workload_dump_SOURCES
=
\
src/workload/codes-workload-dump.c
src_network_workloads_model_net_mpi_replay_SOURCES
=
src/network-workloads/model-net-mpi-replay.c
src_network_workloads_model_net_synthetic_SOURCES
=
src/network-workloads/model-net-synthetic.c
src_network_workloads_model_net_synthetic_slimfly_SOURCES
=
src/network-workloads/model-net-synthetic-slimfly.c
src_network_workloads_model_net_dumpi_traces_dump_SOURCES
=
src/network-workloads/model-net-dumpi-traces-dump.c
src_network_workloads_model_net_mpi_replay_SOURCES
=
src/network-workloads/model-net-mpi-replay.c
src_network_workloads_model_net_synthetic_SOURCES
=
src/network-workloads/model-net-synthetic.c
src_network_workloads_model_net_synthetic_slimfly_SOURCES
=
src/network-workloads/model-net-synthetic-slimfly.c src/network-workloads/dummy.C
src_network_workloads_model_net_dumpi_traces_dump_SOURCES
=
src/network-workloads/model-net-dumpi-traces-dump.c src/network-workloads/dummy.C
#bin_PROGRAMS += src/network-workload/codes-nw-test
...
...
src/networks/model-net/dragonfly-custom.C
View file @
62564150
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment