Merging fixes to custom-dragonfly (1) optimistic mode fix (2) VC issue fixed

8b491087 · Misbah Mubarak · dec76148 · 8b491087 · 8b491087
Commit 8b491087 authored Mar 24, 2017 by Misbah Mubarak
Showing with 91 additions and 34 deletions

src/networks/model-net/dragonfly-custom.C src/networks/model-net/dragonfly-custom.C +89 -32

src/networks/model-net/model-net-lp.c src/networks/model-net/model-net-lp.c +2 -2

No files found.
--- a/src/networks/model-net/dragonfly-custom.C
+++ b/src/networks/model-net/dragonfly-custom.C
--- a/src/networks/model-net/model-net-lp.c
+++ b/src/networks/model-net/model-net-lp.c
@@ -278,10 +278,10 @@ void model_net_base_configure(){
    msg_offsets[TORUS] =
        offsetof(model_net_wrap_msg, msg.m_torus);
    msg_offsets[DRAGONFLY] =
-        offsetof(model_net_wrap_msg, msg.m_custom_dfly);
+        offsetof(model_net_wrap_msg, msg.m_dfly);
    // note: dragonfly router uses the same event struct
    msg_offsets[DRAGONFLY_ROUTER] =
-        offsetof(model_net_wrap_msg, msg.m_custom_dfly);
+        offsetof(model_net_wrap_msg, msg.m_dfly);
    msg_offsets[DRAGONFLY_CUSTOM] =
        offsetof(model_net_wrap_msg, msg.m_custom_dfly);
    msg_offsets[DRAGONFLY_CUSTOM_ROUTER] =