Skip to content

Abins: explicit cache directory management #38620

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

Merged
merged 19 commits into from
Feb 20, 2025
Merged

Abins: explicit cache directory management #38620

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7568b00
Drop __init__ from AbinsAlgorithm
ajjackson Jan 9, 2025
ce8ba6c
Accept CacheDirectory user input to Abins (currently does nothing)
ajjackson Jan 9, 2025
257d368
Modify Abins test cleanup to take cache dir; update loader tests
ajjackson Jan 10, 2025
306f7d7
Update more tests for explicit cache dir
ajjackson Jan 13, 2025
9a2df85
Fix Abins Unit tests; revised cleanup function signature
ajjackson Jan 15, 2025
04581ca
Use explicit cache_directory variable in Abins algorithms
ajjackson Jan 15, 2025
f233f45
Ensure explicit cache_directory is used across Abins and tests
ajjackson Jan 15, 2025
24d9be9
More use of tmpdir on Abins tests
ajjackson Jan 17, 2025
ff9d56d
Rely entirely on tempfile to cleanup Abins tests
ajjackson Jan 17, 2025
8c4079f
More consistent attribute names
ajjackson Jan 17, 2025
32321ba
Make cache_directory argument mandatory
ajjackson Jan 17, 2025
031ca57
More consistent attribute names
ajjackson Jan 17, 2025
6981fcb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2025
2afee74
Add CacheDirectory to Abins-1 doctest
ajjackson Jan 20, 2025
067bd9e
Fix Abins2D doctest (but a bit clunky)
ajjackson Jan 20, 2025
a772d3a
Add release note
ajjackson Jan 22, 2025
fcddc70
Doctests: default parameter for CacheDirectory seems to work!
ajjackson Feb 10, 2025
5e889bf
Rework defaultsave / cleanup logic for Abins doctests
ajjackson Feb 14, 2025
352943f
Further Abins doctest cleanup
ajjackson Feb 14, 2025
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
5 changes: 4 additions & 1 deletion Framework/PythonInterface/plugins/algorithms/Abins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ def PyExec(self):
prog_reporter.report("Input data from the user has been collected.")

# 2) read ab initio data
ab_initio_data = abins.AbinsData.from_calculation_data(self._vibrational_or_phonon_data_file, self._ab_initio_program)
ab_initio_data = abins.AbinsData.from_calculation_data(
self._vibrational_or_phonon_data_file, self._ab_initio_program, cache_directory=self._cache_directory
)
prog_reporter.report("Vibrational/phonon data has been read.")

# 3) calculate S
Expand All @@ -129,6 +131,7 @@ def PyExec(self):
instrument=self._instrument,
quantum_order_num=self._num_quantum_order_events,
autoconvolution_max=autoconvolution_max,
cache_directory=self._cache_directory,
)
s_calculator.progress_reporter = prog_reporter
s_data = s_calculator.get_formatted_data()
Expand Down
7 changes: 6 additions & 1 deletion Framework/PythonInterface/plugins/algorithms/Abins2D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ def PyExec(self):
prog_reporter.report("Input data from the user has been collected.")

# 2) read ab initio data
ab_initio_data = abins.AbinsData.from_calculation_data(self._vibrational_or_phonon_data_file, self._ab_initio_program)
ab_initio_data = abins.AbinsData.from_calculation_data(
self._vibrational_or_phonon_data_file,
self._ab_initio_program,
cache_directory=self._cache_directory,
)
prog_reporter.report("Vibrational/phonon data has been read.")

# 3) calculate S
Expand All @@ -139,6 +143,7 @@ def PyExec(self):
autoconvolution_max=autoconvolution_max,
instrument=self._instrument,
quantum_order_num=self._num_quantum_order_events,
cache_directory=self._cache_directory,
)
s_calculator.progress_reporter = prog_reporter
s_data = s_calculator.get_formatted_data()
Expand Down
Loading
Loading