Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/sst/elements/merlin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused why this test failed: https://sst-jenkins.sandia.gov/job/SST__Autotest_OSX-15-XC16_OMPI-4.1.6_PY3.10_sst-elements/1320/consoleFull

It looks like it's complaining but the change is exactly what you made here???

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SHA of the commit being used is correct. It shouldn't be from testing the merge with devel, since that's what running locally also defaults to. I'll try running locally on that machine, without the SQE changes in sstsimulator/sst-sqe#1245, and also look at the Jenkins config for this job.

I am surprised that the test is being executed at all, which means the Python dependencies are present on that machine (not sure how).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To the last point, I am seeing failures on nightlies for a few of these tests now, for tests that pass on the head node.

I am not sure how we normally handle (floating point) differences in required reference data for different machines, I'll need to look at the testing framework.


Simulation is complete, simulated time: 400 us
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading