diff --git a/src/sst/elements/merlin/Makefile.am b/src/sst/elements/merlin/Makefile.am index 734d0af006..b6622c70d4 100644 --- a/src/sst/elements/merlin/Makefile.am +++ b/src/sst/elements/merlin/Makefile.am @@ -94,6 +94,12 @@ libmerlin_la_SOURCES = \ pymerlin-router.py \ interfaces/pymerlin-interface.py \ target_generator/pymerlin-targetgen.py \ + topology/anytopo_utility/DallyDragonfly.py \ + topology/anytopo_utility/HPC_topos.py \ + topology/anytopo_utility/__init__.py \ + topology/anytopo_utility/Jellyfish.py \ + topology/anytopo_utility/Polarfly.py \ + topology/anytopo_utility/Slimfly.py \ topology/pymerlin-topo-any.py \ topology/pymerlin-topo-dragonfly.py \ topology/pymerlin-topo-polarfly.py \ @@ -104,6 +110,15 @@ libmerlin_la_SOURCES = \ EXTRA_DIST = \ tests/testsuite_default_merlin.py \ + tests/anytopo_complete_4_test.py \ + tests/anytopo_cubical_test.py \ + tests/anytopo_dallydragonfly_test.py \ + tests/anytopo_ember_complete_4_test.py \ + tests/anytopo_jellyfish_test.py \ + tests/anytopo_polarfly_test.py \ + tests/anytopo_slimfly_test.py \ + tests/anytopo_slimfly_UGAL_test.py \ + tests/anytopo_slimfly_UGAL_threshold_test.py \ tests/hyperx_128_test.py \ tests/dragon_128_test.py \ tests/dragon_72_test.py \ @@ -119,6 +134,15 @@ EXTRA_DIST = \ tests/dragon_128_test_deferred.py \ tests/polarfly_455_test.py \ tests/polarstar_504_test.py \ + tests/refFiles/test_merlin_anytopo_complete_4_test.out \ + tests/refFiles/test_merlin_anytopo_cubical_test.out \ + tests/refFiles/test_merlin_anytopo_dallydragonfly_test.out \ + tests/refFiles/test_merlin_anytopo_ember_complete_4_test.out \ + tests/refFiles/test_merlin_anytopo_jellyfish_test.out \ + tests/refFiles/test_merlin_anytopo_polarfly_test.out \ + tests/refFiles/test_merlin_anytopo_slimfly_test.out \ + tests/refFiles/test_merlin_anytopo_slimfly_UGAL_test.out \ + tests/refFiles/test_merlin_anytopo_slimfly_UGAL_threshold_test.out \ tests/refFiles/test_merlin_dragon_128_platform_test.out \ tests/refFiles/test_merlin_dragon_128_platform_test_cm.out \ tests/refFiles/test_merlin_dragon_128_test.out \ diff --git a/src/sst/elements/merlin/tests/refFiles/test_merlin_anytopo_jellyfish_test.out b/src/sst/elements/merlin/tests/refFiles/test_merlin_anytopo_jellyfish_test.out index 51804b8652..6ff031c629 100644 --- a/src/sst/elements/merlin/tests/refFiles/test_merlin_anytopo_jellyfish_test.out +++ b/src/sst/elements/merlin/tests/refFiles/test_merlin_anytopo_jellyfish_test.out @@ -1,6 +1,6 @@ Loaded NetworkX graph with 16 vertices and 32 edges Offered Average Load Latency - 0.50 268.375 ns + 0.50 262.401 ns Simulation is complete, simulated time: 400 us diff --git a/src/sst/elements/merlin/topology/anytopo_utility/Jellyfish.py b/src/sst/elements/merlin/topology/anytopo_utility/Jellyfish.py index 687b117cbe..7237de0966 100644 --- a/src/sst/elements/merlin/topology/anytopo_utility/Jellyfish.py +++ b/src/sst/elements/merlin/topology/anytopo_utility/Jellyfish.py @@ -11,7 +11,7 @@ def __init__(self, *args, **kwargs): super(JellyfishTopo, self).__init__("jellyfish") degree=args[1] num_vertices=args[0] - self.nx_graph = nx.random_regular_graph(degree, num_vertices, seed=0) + self.nx_graph = nx.random_regular_graph(degree, num_vertices, seed=10) elif len(args) == 3 and isinstance(args[0], int) and isinstance(args[1], int) and isinstance(args[2], int): super(JellyfishTopo, self).__init__("jellyfish")