From daae1d3561aeaee1a1ab6d1ef185c1aa85ceec69 Mon Sep 17 00:00:00 2001 From: Dan King Date: Tue, 31 Jan 2023 17:11:31 -0500 Subject: [PATCH] revert change to global seed --- hail/python/hail/context.py | 5 ++--- hail/python/test/hail/test_randomness.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/hail/python/hail/context.py b/hail/python/hail/context.py index 61009e267b9d..3d6f2531f62f 100644 --- a/hail/python/hail/context.py +++ b/hail/python/hail/context.py @@ -116,11 +116,10 @@ def __init__(self, log, quiet, append, tmpdir, local_tmpdir, global_seed, backen ' the latest changes weekly.\n') sys.stderr.write(f'LOGGING: writing to {log}\n') + self._user_specified_rng_nonce = True if global_seed is None: - self._user_specified_rng_nonce = False - backend.set_flags(rng_nonce=str(Random().randrange(-2**63, 2**63 - 1))) + backend.set_flags(rng_nonce=str(0)) else: - self._user_specified_rng_nonce = True backend.set_flags(rng_nonce=str(global_seed)) Env._hc = self diff --git a/hail/python/test/hail/test_randomness.py b/hail/python/test/hail/test_randomness.py index f5eb501c1b79..fcafee376840 100644 --- a/hail/python/test/hail/test_randomness.py +++ b/hail/python/test/hail/test_randomness.py @@ -64,16 +64,16 @@ def test_matrix_table_entries(): mt = hl.utils.range_matrix_table(5, 2) mt = mt.annotate_entries(x = hl.rand_int32(5)) expected = [ - hl.Struct(row_idx=0, col_idx=0, x=1), - hl.Struct(row_idx=0, col_idx=1, x=2), + hl.Struct(row_idx=0, col_idx=0, x=0), + hl.Struct(row_idx=0, col_idx=1, x=3), hl.Struct(row_idx=1, col_idx=0, x=2), - hl.Struct(row_idx=1, col_idx=1, x=3), - hl.Struct(row_idx=2, col_idx=0, x=0), + hl.Struct(row_idx=1, col_idx=1, x=4), + hl.Struct(row_idx=2, col_idx=0, x=1), hl.Struct(row_idx=2, col_idx=1, x=4), - hl.Struct(row_idx=3, col_idx=0, x=3), - hl.Struct(row_idx=3, col_idx=1, x=0), + hl.Struct(row_idx=3, col_idx=0, x=4), + hl.Struct(row_idx=3, col_idx=1, x=2), hl.Struct(row_idx=4, col_idx=0, x=4), - hl.Struct(row_idx=4, col_idx=1, x=3) + hl.Struct(row_idx=4, col_idx=1, x=4), ] actual = mt.entries().collect() assert expected == actual @@ -84,7 +84,7 @@ def test_table_filter(): ht = hl.utils.range_table(5) ht = ht.annotate(x = hl.rand_int32(5)) ht = ht.filter(ht.x % 3 == 0) - expected = [hl.Struct(idx=2, x=3)] + expected = [hl.Struct(idx=1, x=3), hl.Struct(idx=3, x=3), hl.Struct(idx=4, x=3)] actual = ht.collect() assert expected == actual