Skip to content
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.

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

Release 0.4.1 #543

Merged
merged 118 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
45cb05a
Made shell of a migration plan.
MicahGale Aug 26, 2024
873b0d0
Added deprecation not to material_component.
MicahGale Aug 26, 2024
884bba7
Add profiling and benckmarking (#513)
MicahGale Aug 28, 2024
7b3c57f
Squashed profile commits that mat_optimize had
MicahGale Aug 27, 2024
f1a2118
Made mechanism for data inputs to flag self for deletion.
MicahGale Aug 28, 2024
7ffa073
Moved material linking to thermal_scattering with hashing.
MicahGale Aug 28, 2024
ee67149
Changed how thermal scattering linking occurs in test.
MicahGale Aug 28, 2024
3f248a9
Seriously lowered the benchmark threshold
MicahGale Aug 28, 2024
ff61447
Added #510 to changelog.
MicahGale Aug 28, 2024
05a9bce
Switched order of filters to make sense.
MicahGale Aug 28, 2024
5a12a28
Merge pull request #518 from idaholab/mat_optimize
MicahGale Aug 28, 2024
9ab65f6
Implemented reading input from a stream.
MicahGale Aug 28, 2024
97683b9
Test read/write all input files.
MicahGale Aug 28, 2024
c5534ae
Made verification tests harder.
MicahGale Aug 28, 2024
c260d75
Replicated #499 by forcing a recompression.
MicahGale Aug 28, 2024
94233d4
Dumped whole file to stdout.
MicahGale Aug 28, 2024
e377297
Expand tabs and update test to new inputs.
MicahGale Aug 28, 2024
37cf930
tried to use interpolation for test.
MicahGale Aug 28, 2024
0eab3c9
Actually replicated #499 with multiple shortcuts in a line.
MicahGale Aug 28, 2024
2f92864
Updated test again with new importance gold.
MicahGale Aug 28, 2024
c577a88
Fixed logic to detect when you can smash repeats together.
MicahGale Aug 28, 2024
c4b56ac
Updated logic to test for matching value with valueNode.
MicahGale Aug 28, 2024
4f71d4a
Undid debugging.
MicahGale Aug 28, 2024
4284c03
Updated logic to always check for edge node matching.
MicahGale Aug 28, 2024
4c7265e
Updated tests to cover more edge cases.
MicahGale Aug 29, 2024
1529886
Made logic clearer and more pythonic.
MicahGale Aug 29, 2024
5e0f8ab
Removed implicit importance to avoid parrot out bug.
MicahGale Aug 29, 2024
2d3aa54
Fixed bug in validate for cylinder_on_axis.
MicahGale Aug 29, 2024
8ff6b69
Made it possible to have integer interpolations.
MicahGale Aug 29, 2024
73800b8
Started framework for geometry tree recompressing interpolations.
MicahGale Aug 29, 2024
b8b8b3b
Switched to preserving shortcut type for geometry stuff.
MicahGale Aug 29, 2024
0582457
Exposed shortcut type.
MicahGale Aug 29, 2024
dd16501
Made system to make a shortcutNode from scratch kind of.
MicahGale Aug 29, 2024
e9d2e4e
Formatted shortcuts inside of GeometryTree
MicahGale Aug 29, 2024
5d17fd1
Updated tests to avoid complex reads and implicit importances.
MicahGale Aug 29, 2024
f06e7db
Fixed interal link to migration.
MicahGale Aug 29, 2024
4902c43
Wrote up a description of the deprecations.
MicahGale Aug 29, 2024
525ab43
Deprecated material_components.
MicahGale Aug 29, 2024
0e9f406
Avoided triggering deprecation warnings internally.
MicahGale Aug 29, 2024
2b676e0
Added tests to test for deprecation.
MicahGale Aug 29, 2024
a7cfce3
Merge branch 'develop' into mat_deprecate
MicahGale Aug 29, 2024
1e87abf
Added helpful description.
MicahGale Aug 29, 2024
8e88ce3
Added #506 to changelog.
MicahGale Aug 29, 2024
ba4ce30
Replicated #352.
MicahGale Aug 30, 2024
0f79257
Fixed test to expect three leading comments.
MicahGale Aug 30, 2024
fabfb52
Made system to ignore default parameters for trailing comments.
MicahGale Aug 30, 2024
f033d97
Avoid cross-block trailing comment transfer.
MicahGale Aug 30, 2024
3edca07
Updated delete trailing comment to match new get_trailing_comment.
MicahGale Aug 30, 2024
08a0c98
Skip empty nodes in the tail.
MicahGale Aug 30, 2024
bd3e31f
Updated test to be more thurough)
MicahGale Aug 31, 2024
081d4db
Updated ClassifierNode handling of padding for trailing and str.
MicahGale Aug 31, 2024
5029946
Updated get trailing comment logic to handle valueNodes in tree.
MicahGale Aug 31, 2024
f87c875
Updated complex logic for deleteing trailing comments.
MicahGale Aug 31, 2024
ee08583
Updated geometry expansion tests to be more exhaustive.
MicahGale Aug 31, 2024
aa06f22
Fixed test to be looser.
MicahGale Aug 31, 2024
3f7f277
fixed bugs in M in geometry.
MicahGale Aug 31, 2024
a00afe4
Added more edge cases.
MicahGale Aug 31, 2024
ab65de6
Started debugging.
MicahGale Aug 31, 2024
97bca51
Made system for tracking left and right shortuts
MicahGale Sep 2, 2024
24ca152
Updated shortcut finding logic to find shortcuts in the middle.
MicahGale Sep 2, 2024
a9517e8
Close enough with padding.
MicahGale Sep 2, 2024
aca2f85
Updated changelog with #520 PR.
MicahGale Sep 2, 2024
59058d0
Avoided marking shortcuts overriding old shortcut.
MicahGale Sep 2, 2024
b6ec5d4
Fixed over-appending leaves to the new list.
MicahGale Sep 2, 2024
75132d2
Created migrations folder.
MicahGale Sep 2, 2024
811ebed
Marked Isotope class as deprecated.
MicahGale Sep 2, 2024
e7123f8
Added deprecation warnings for inits.
MicahGale Sep 2, 2024
e403cca
Updated mat tests to handle deprecation warnings.
MicahGale Sep 2, 2024
b42f4a8
Added tests for mark_last_leaf_shortcut.
MicahGale Sep 3, 2024
847d2d2
Started testing for flatten_shortcut.
MicahGale Sep 3, 2024
06a44cb
Finished test for flatten_shortcuts.
MicahGale Sep 3, 2024
bfa81a8
Fixed test typos.
MicahGale Sep 3, 2024
0e15135
Fixed tests because I can't count at all.
MicahGale Sep 3, 2024
f7d140d
Fixed bug with excess depth in call.
MicahGale Sep 3, 2024
058b757
Cleaned up with @tjlaboss feedback.
MicahGale Sep 3, 2024
f7ff8ba
Added test replicate new edge case from @tjlaboss.
MicahGale Sep 3, 2024
9483f89
Added more exhaustive shortcut tests.
MicahGale Sep 3, 2024
6b6cdcb
Expanded using last node on formatting to all shortcuts, and handled …
MicahGale Sep 3, 2024
82d7c9e
Fixed test to be all caps.
MicahGale Sep 3, 2024
9430561
Updated logic for multiply shortcuts using neigbors.
MicahGale Sep 3, 2024
5a8b34a
Created system to track starting value for interpolate in geometry tr…
MicahGale Sep 3, 2024
628cd9d
Added doc strings for new functions.
MicahGale Sep 3, 2024
1a7ea28
Fixed typo
MicahGale Sep 4, 2024
020aeea
Replicated issue #521.
MicahGale Sep 9, 2024
1d45c9c
Fixed material parser to be able to parse plib=84p.
MicahGale Sep 9, 2024
1d3361d
Added #521 to changelog.
MicahGale Sep 9, 2024
2c25c23
Made tests stricter to only insert once.
MicahGale Sep 10, 2024
d14d96d
Replicated error #516.
MicahGale Sep 10, 2024
8b50e68
Changed order of appending to allow failure first.
MicahGale Sep 10, 2024
d393950
Updated changelog with #516.
MicahGale Sep 10, 2024
8e15ea6
Merge pull request #538 from idaholab/516-materialsappend_renumber-ad…
MicahGale Sep 10, 2024
bda5bd9
Merge branch 'develop' into 521-problem-formatting-material-with-plib…
MicahGale Sep 10, 2024
aeebf91
Merge branch 'develop' into mat_deprecate
MicahGale Sep 10, 2024
0848559
Merge branch 'develop' into 499-shortcuts-recompressed-incorrectly
MicahGale Sep 10, 2024
ccfe4fd
Added a cute ascii snek (v important)
tjlaboss Sep 10, 2024
1f04794
Merge pull request #528 from idaholab/mat_deprecate
MicahGale Sep 10, 2024
843db18
Merge branch 'develop' into 499-shortcuts-recompressed-incorrectly
tjlaboss Sep 10, 2024
00e42ed
Merge branch 'develop' into snek.txt
MicahGale Sep 10, 2024
c43e8cf
Triggered edge case from #526 #520
MicahGale Sep 10, 2024
128c651
Update gold value with new line.
MicahGale Sep 10, 2024
bfdb083
Tried to move the trailing comments around the special tree for now.
MicahGale Sep 10, 2024
bd98d60
Merge pull request #541 from idaholab/snek.txt
MicahGale Sep 10, 2024
517db64
Merge branch 'develop' into 521-problem-formatting-material-with-plib…
MicahGale Sep 10, 2024
92f52e4
Merge branch 'develop' into 499-shortcuts-recompressed-incorrectly
MicahGale Sep 10, 2024
9a88b22
Updated test with new input model.
MicahGale Sep 10, 2024
9acdc7f
Fixed potential repr bug.
MicahGale Sep 10, 2024
39a12c4
Tried to figure out where this stupid valuenode comment is coming from.
MicahGale Sep 10, 2024
35ffa26
Made test more robust.
MicahGale Sep 10, 2024
ff6b81f
Found where the syntax node actually lives; needs work.
MicahGale Sep 10, 2024
6e3a273
Added tests for all lib identifiers.
MicahGale Sep 11, 2024
b8b1a2c
Removed forsed failure.
MicahGale Sep 11, 2024
9da343a
Setup system to track which particles were paired up.
MicahGale Sep 11, 2024
5882881
Updated to use actual trees, and ensured all affected trees cleared.
MicahGale Sep 11, 2024
7d3294d
Merge pull request #537 from idaholab/521-problem-formatting-material…
MicahGale Sep 11, 2024
1b559bc
Merge branch 'develop' into 499-shortcuts-recompressed-incorrectly
MicahGale Sep 11, 2024
a30549b
Fixed bug where the parameters weren't actually loaded into syntax tree.
MicahGale Sep 11, 2024
8329afe
Merge pull request #520 from idaholab/499-shortcuts-recompressed-inco…
MicahGale Sep 11, 2024
1861e6e
Updating changelog to next version: 0.4.1
MicahGale Sep 11, 2024
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
32 changes: 31 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,38 @@ jobs:
python-version: 3.12
- run: pip install . montepy[format]
- run: black --check montepy/ tests/


profile:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: set up python 3.12
uses: actions/setup-python@v5
with:
python-version: 3.12
- run: pip install . montepy[test]
- run: pytest --profile
name: Profile test suite
- run: python prof/dump_results.py
name: Display pytest profiling data
- run: python prof/profile_big_model.py
name: Profile against big model

benchmark:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: set up python 3.12
uses: actions/setup-python@v5
with:
python-version: 3.12
- run: pip install . montepy[test]
- run: python benchmark/benchmark_big_model.py
name: Benchmark against big model


changelog-test:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/main'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dist/*
.coverage
.idea/*
*.*.sw*
*.prof
doc/build/*
.coverage
.idea/
Expand Down
21 changes: 21 additions & 0 deletions benchmark/benchmark_big_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import montepy

import time
import tracemalloc

FAIL_THRESHOLD = 30

tracemalloc.start()
start = time.time()

problem = montepy.read_input("benchmark/big_model.imcnp")

stop = time.time()

print(f"Took {stop - start} seconds")
print(f"Memory usage report: {tracemalloc.get_traced_memory()}")

if (stop - start) > FAIL_THRESHOLD:
raise RuntimeError(
f"Benchmark took too long to complete. It must be faster than: {FAIL_THRESHOLD} s."
)
Loading