physics/deepdog
2
0
Fork 0
Code Issues 2 Pull Requests 9 Projects Releases Wiki Activity

betterparallel #7

Merged
deepak merged 3 commits from betterparallel into master 2022-04-30 16:15:03 +00:00
Conversation 0 Commits 3 Files Changed 1 +24 -22
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit edf0ba6532 - Show all commits

46
deepdog/alt_bayes_run_simulpairs.py
View File

@ -41,26 +41,26 @@ def get_a_simul_result_using_pairs(input) -> numpy.ndarray:
rng = numpy.random.default_rng(seed) rng = numpy.random.default_rng(seed)
local_total = 0 local_total = 0
combined_total = 0 combined_total = 0
for i in range(monte_carlo_cycles):
sample_dipoles = discretisation.get_model().get_n_single_dipoles(
monte_carlo_count, max_frequency, rng_to_use=rng
)
local_vals = pdme.util.fast_v_calc.fast_vs_for_dipoles(
dot_inputs, sample_dipoles
)
local_matches = pdme.util.fast_v_calc.between(
local_vals, local_lows, local_highs
)
nonlocal_vals = pdme.util.fast_nonlocal_spectrum.fast_s_nonlocal(
pair_inputs, sample_dipoles
)
nonlocal_matches = pdme.util.fast_v_calc.between(
nonlocal_vals, nonlocal_lows, nonlocal_highs
)
combined_matches = numpy.logical_and(local_matches, nonlocal_matches)
local_total += numpy.count_nonzero(local_matches) sample_dipoles = discretisation.get_model().get_n_single_dipoles(
combined_total += numpy.count_nonzero(combined_matches) monte_carlo_count, max_frequency, rng_to_use=rng
)
local_vals = pdme.util.fast_v_calc.fast_vs_for_dipoles(
dot_inputs, sample_dipoles
)
local_matches = pdme.util.fast_v_calc.between(
local_vals, local_lows, local_highs
)
nonlocal_vals = pdme.util.fast_nonlocal_spectrum.fast_s_nonlocal(
pair_inputs, sample_dipoles
)
nonlocal_matches = pdme.util.fast_v_calc.between(
nonlocal_vals, nonlocal_lows, nonlocal_highs
)
combined_matches = numpy.logical_and(local_matches, nonlocal_matches)
local_total += numpy.count_nonzero(local_matches)
combined_total += numpy.count_nonzero(combined_matches)
return numpy.array([local_total, combined_total]) return numpy.array([local_total, combined_total])
@ -223,6 +223,7 @@ class AltBayesRunSimulPairs:
<= self.target_success <= self.target_success
): ):
_logger.debug(f"Starting cycle {cycles}") _logger.debug(f"Starting cycle {cycles}")
_logger.debug(f"(pair, no_pair) successes are {(cycle_success_pairs, cycle_success_no_pairs)}")
cycles += 1 cycles += 1
current_success_pairs = 0 current_success_pairs = 0
current_success_no_pairs = 0 current_success_no_pairs = 0
@ -232,7 +233,8 @@ class AltBayesRunSimulPairs:
# note this needs to be inside the loop for monte carlo cycle steps! # note this needs to be inside the loop for monte carlo cycle steps!
# that way we get more stuff. # that way we get more stuff.
seeds = seed_sequence.spawn(core_count) seeds = seed_sequence.spawn(self.monte_carlo_cycles)
_logger.debug(f"Creating {self.monte_carlo_cycles} seeds")
current_success_both = numpy.array( current_success_both = numpy.array(
sum( sum(
pool.imap_unordered( pool.imap_unordered(
@ -330,8 +332,8 @@ class AltBayesRunSimulPairs:
): ):
row_pairs[f"{name}_prob"] = probability_pair row_pairs[f"{name}_prob"] = probability_pair
row_no_pairs[f"{name}_prob"] = probability_no_pair row_no_pairs[f"{name}_prob"] = probability_no_pair
_logger.info(row_pairs) _logger.debug(row_pairs)
_logger.info(row_no_pairs) _logger.debug(row_no_pairs)
with open(self.filename_pairs, "a", newline="") as outfile: with open(self.filename_pairs, "a", newline="") as outfile:
writer = csv.DictWriter( writer = csv.DictWriter(