Skip to content

Commit

Permalink
Updating if block, add indexing to test, add testing to old implement…
Browse files Browse the repository at this point in the history 
…ation, add remove value binops forall loop
  • Loading branch information
@jaketrookman
jaketrookman committed Oct 5, 2023
1 parent c834904 commit f1625c6
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 50 deletions.
2 changes: 1 addition & 1 deletion PROTO_tests/tests/indexing_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,5 @@ def test_bigint_indexing_preserves_max_bits(self):

def test_handling_bigint_max_bits(self):
a = ak.arange(2**200 - 1, 2**200 + 11)
a.max_bits = 3
a[:] = ak.array(a, dtype=ak.bigint, max_bits=3)
assert [7, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2] == a.to_list()
64 changes: 15 additions & 49 deletions src/IndexingMsg.chpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,12 +608,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = valueArg.getBigIntValue();
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[idx] = val;
Expand All @@ -622,12 +619,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = valueArg.getIntValue():bigint;
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[idx] = val;
Expand All @@ -636,12 +630,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = valueArg.getUIntValue():bigint;
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[idx] = val;
Expand All @@ -650,12 +641,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = valueArg.getBoolValue():bigint;
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[idx] = val;
Expand Down Expand Up @@ -1174,12 +1162,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = value.getBigIntValue();
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[slice] = val;
Expand All @@ -1188,12 +1173,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = value.getIntValue():bigint;
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[slice] = val;
Expand All @@ -1202,12 +1184,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = value.getUIntValue():bigint;
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[slice] = val;
Expand All @@ -1216,12 +1195,9 @@ module IndexingMsg
var e = toSymEntry(gEnt,bigint);
var val = value.getBoolValue():bigint;
var max_size = 1:bigint;
var has_max_bits = e.max_bits != -1;
if has_max_bits {
if e.max_bits != -1 {
max_size <<= e.max_bits;
max_size -= 1;
}
if has_max_bits {
val &= max_size;
}
e.a[slice] = val;
Expand Down Expand Up @@ -1357,13 +1333,12 @@ module IndexingMsg
var x = toSymEntry(gX,bigint);
var y = toSymEntry(gY,bigint);
var max_size = 1:bigint;
var has_max_bits = x.max_bits != -1;
if has_max_bits {
if x.max_bits != -1 {
max_size <<= x.max_bits;
max_size -= 1;
}
if has_max_bits {
y.a &= max_size;
forall y in y.a with (var local_max_size = max_size) {
y &= local_max_size;
}
}
x.a[slice] = y.a;
}
Expand All @@ -1372,12 +1347,9 @@ module IndexingMsg
var y = toSymEntry(gY,int);
var ya = y.a:bigint;
var max_size = 1:bigint;
var has_max_bits = x.max_bits != -1;
if has_max_bits {
if x.max_bits != -1 {
max_size <<= x.max_bits;
max_size -= 1;
}
if has_max_bits {
ya &= max_size;
}
x.a[slice] = ya;
Expand All @@ -1387,12 +1359,9 @@ module IndexingMsg
var y = toSymEntry(gY,uint);
var ya = y.a:bigint;
var max_size = 1:bigint;
var has_max_bits = x.max_bits != -1;
if has_max_bits {
if x.max_bits != -1 {
max_size <<= x.max_bits;
max_size -= 1;
}
if has_max_bits {
ya &= max_size;
}
x.a[slice] = ya;
Expand All @@ -1403,12 +1372,9 @@ module IndexingMsg
// TODO change once we can cast directly from bool to bigint
var ya = y.a:int:bigint;
var max_size = 1:bigint;
var has_max_bits = x.max_bits != -1;
if has_max_bits {
if x.max_bits != -1 {
max_size <<= x.max_bits;
max_size -= 1;
}
if has_max_bits {
ya &= max_size;
}
x.a[slice] = ya;
Expand Down
5 changes: 5 additions & 0 deletions tests/indexing_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,8 @@ def test_bigint_indexing_preserves_max_bits(self):
a = ak.arange(2**200 - 1, 2**200 + 11, max_bits=max_bits)
self.assertEqual(max_bits, a[ak.arange(10)].max_bits)
self.assertEqual(max_bits, a[:].max_bits)

def test_handling_bigint_max_bits(self):
a = ak.arange(2**200 - 1, 2**200 + 11)
a[:] = ak.array(a, dtype=ak.bigint, max_bits=3)
self.assertListEqual([7, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2], a.to_list())

0 comments on commit f1625c6

Please sign in to comment.