Skip to content

Update polarstar/polarfly test references and clean up import checking #2186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
berquist wants to merge 2 commits into
base: devel
Choose a base branch
from
+11 −12
Open

Update polarstar/polarfly test references and clean up import checking #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e38429
Clean up import exception usage
berquist Jul 28, 2023
609e21f
Update polarstar and polarfly gold data for additional debug output
berquist Jul 28, 2023
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
1 change: 1 addition & 0 deletions src/sst/elements/merlin/tests/refFiles/test_merlin_polarfly_455_test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 2 additions & 0 deletions src/sst/elements/merlin/tests/refFiles/test_merlin_polarstar_504_test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/sst/elements/merlin/tests/testsuite_default_merlin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

################################################################################
Expand Down
13 changes: 5 additions & 8 deletions src/sst/elements/merlin/topology/pymerlin-topo-polarfly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')


#############################################
Expand All @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/sst/elements/merlin/topology/pymerlin-topo-polarstar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@

try:
import networkx as nx
except:
except ImportError:
pass
#print('--> MODULE NOT FOUND: networkx')

def isPowerOfPrime(num):
if (num<2):
Expand Down