diff --git a/src/sst/elements/merlin/tests/refFiles/test_merlin_polarfly_455_test.out b/src/sst/elements/merlin/tests/refFiles/test_merlin_polarfly_455_test.out index deb795b5b5..bf1fd06b9a 100644 --- a/src/sst/elements/merlin/tests/refFiles/test_merlin_polarfly_455_test.out +++ b/src/sst/elements/merlin/tests/refFiles/test_merlin_polarfly_455_test.out @@ -1,4 +1,5 @@ ----> Generating Polarfly topology!! +--> Validating Polarfly(9): 8852: 229 Finished sending packets (total of 10) 8852: 272 Finished sending packets (total of 10) 8852: 273 Finished sending packets (total of 10) diff --git a/src/sst/elements/merlin/tests/refFiles/test_merlin_polarstar_504_test.out b/src/sst/elements/merlin/tests/refFiles/test_merlin_polarstar_504_test.out index 5b5206442c..6a4da07ac8 100644 --- a/src/sst/elements/merlin/tests/refFiles/test_merlin_polarstar_504_test.out +++ b/src/sst/elements/merlin/tests/refFiles/test_merlin_polarstar_504_test.out @@ -5,6 +5,8 @@ SuperNodeSize = 8 Num SuperNodes: 21 ------> Generating Polarstar topology!! ----> Generating Inductive-quad Graph +--> Validating Inducitve-Quad(3): +--> Validating PolarStar(8): 10196: 38 Finished sending packets (total of 10) 10547: 47 Finished sending packets (total of 10) 10615: 113 Finished sending packets (total of 10) diff --git a/src/sst/elements/merlin/tests/testsuite_default_merlin.py b/src/sst/elements/merlin/tests/testsuite_default_merlin.py index 88e6cdc2f9..a5f93a0bf6 100644 --- a/src/sst/elements/merlin/tests/testsuite_default_merlin.py +++ b/src/sst/elements/merlin/tests/testsuite_default_merlin.py @@ -5,11 +5,11 @@ try: from sympy.polys.domains import ZZ -except: +except ImportError: pass try: from sympy.polys.galoistools import (gf_irreducible_p, gf_add, gf_mul, gf_rem) -except: +except ImportError: pass ################################################################################ diff --git a/src/sst/elements/merlin/topology/pymerlin-topo-polarfly.py b/src/sst/elements/merlin/topology/pymerlin-topo-polarfly.py index 9c16874731..580f74c1b7 100644 --- a/src/sst/elements/merlin/topology/pymerlin-topo-polarfly.py +++ b/src/sst/elements/merlin/topology/pymerlin-topo-polarfly.py @@ -18,19 +18,16 @@ try: from sympy.polys.domains import ZZ -except: +except ImportError: pass - #print('--> MODULE NOT FOUND: sympy.polys.domains') try: from sympy.polys.galoistools import (gf_irreducible_p, gf_add, gf_mul, gf_rem) -except: +except ImportError: pass - #print('--> MODULE NOT FOUND: sympy.polys.galoistools') try: import networkx as nx -except: +except ImportError: pass - #print('--> MODULE NOT FOUND: networkx') ############################################# @@ -41,10 +38,10 @@ class GF(): def __init__(self, pp): if not ('sympy.polys.galoistools' in sys.modules): - raise Exception('--> Did not load Sympy Polys Galoistools : module required for field construction') + raise ImportError('--> Did not load Sympy Polys Galoistools : module required for field construction') if not ('sympy.polys.domains' in sys.modules): - raise Exception('--> Did not load Sympy Polys Domains : module required for field construction') + raise ImportError('--> Did not load Sympy Polys Domains : module required for field construction') self.pp = int(pp) diff --git a/src/sst/elements/merlin/topology/pymerlin-topo-polarstar.py b/src/sst/elements/merlin/topology/pymerlin-topo-polarstar.py index 123f7dd2a4..be30b7823c 100644 --- a/src/sst/elements/merlin/topology/pymerlin-topo-polarstar.py +++ b/src/sst/elements/merlin/topology/pymerlin-topo-polarstar.py @@ -17,9 +17,8 @@ try: import networkx as nx -except: +except ImportError: pass - #print('--> MODULE NOT FOUND: networkx') def isPowerOfPrime(num): if (num<2):