Skip to content

Commit bfd76d9

Browse files
mawad-amdclaude
andauthored
Absorb iris.x into Context, delete iris/x/ (#521)
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 59fe573 commit bfd76d9

25 files changed

Lines changed: 762 additions & 1426 deletions

.github/scripts/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ INSTALL_METHOD=${4:-"editable"}
2222
if [ -z "$TEST_DIR" ] || [ -z "$NUM_RANKS" ]; then
2323
echo "[ERROR] Missing required arguments"
2424
echo "Usage: $0 <test_dir> <num_ranks> [gpu_devices] [install_method]"
25-
echo " test_dir: examples, unittests, x or ccl"
25+
echo " test_dir: examples, unittests, context, ccl, or ops"
2626
echo " num_ranks: 1, 2, 4, or 8"
2727
echo " install_method: git, editable, or install (default: editable)"
2828
exit 1

.github/workflows/iris-nightly-triton-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646
num_ranks: 4
4747
- test_dir: ccl
4848
num_ranks: 8
49-
- test_dir: x
49+
- test_dir: context
5050
num_ranks: 1
51-
- test_dir: x
51+
- test_dir: context
5252
num_ranks: 2
53-
- test_dir: x
53+
- test_dir: context
5454
num_ranks: 4
55-
- test_dir: x
55+
- test_dir: context
5656
num_ranks: 8
5757
- test_dir: ops
5858
num_ranks: 1

.github/workflows/iris-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ jobs:
4848
num_ranks: 4
4949
- test_dir: ccl
5050
num_ranks: 8
51-
- test_dir: x
51+
- test_dir: context
5252
num_ranks: 1
53-
- test_dir: x
53+
- test_dir: context
5454
num_ranks: 2
55-
- test_dir: x
55+
- test_dir: context
5656
num_ranks: 4
57-
- test_dir: x
57+
- test_dir: context
5858
num_ranks: 8
5959
- test_dir: ops
6060
num_ranks: 1
@@ -124,7 +124,7 @@ jobs:
124124
num_ranks: 2
125125
- test_dir: ccl
126126
num_ranks: 2
127-
- test_dir: x
127+
- test_dir: context
128128
num_ranks: 2
129129
- test_dir: ops
130130
num_ranks: 2
@@ -185,7 +185,7 @@ jobs:
185185
num_ranks: 2
186186
- test_dir: ccl
187187
num_ranks: 2
188-
- test_dir: x
188+
- test_dir: context
189189
num_ranks: 2
190190
- test_dir: ops
191191
num_ranks: 2

iris/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@
4545
from iris.host.iris import Iris, iris
4646
from iris.mem.triton.context import Context, Context as DeviceContext
4747
from iris.host.tracing.events import TraceEvent
48+
from iris.mem.triton.types import (
49+
Tile,
50+
TileView,
51+
TensorView,
52+
AllReduceConfig,
53+
make_tensor_view,
54+
)
4855
from iris.mem.triton.ops import (
4956
load,
5057
store,
@@ -94,6 +101,11 @@
94101
"Context",
95102
"DeviceContext",
96103
"TraceEvent",
104+
"Tile",
105+
"TileView",
106+
"TensorView",
107+
"AllReduceConfig",
108+
"make_tensor_view",
97109
"load",
98110
"store",
99111
"copy",

iris/mem/triton/__init__.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@
66
from .context import Context as DeviceContext # noqa: F401 backward compat
77
from .tracing import Tracing # noqa: F401
88
from .tracing import Tracing as DeviceTracing # noqa: F401 backward compat
9+
from .types import ( # noqa: F401
10+
Tile,
11+
TileView,
12+
TensorView,
13+
AllReduceConfig,
14+
make_tensor_view,
15+
tile_layout,
16+
tile_ptr,
17+
offset_ptr,
18+
chiplet_transform_chunked,
19+
compute_tile_indices,
20+
compute_tile_offsets,
21+
)
922
from .ops import ( # noqa: F401
1023
load,
1124
store,

0 commit comments

Comments
 (0)