Skip to content

Commit 5e119cc

Browse files
dunnoconnorcolgur
authored andcommitted
update atomic import (modular#242)
* update atomic import * Update MAX to latest nightly
1 parent 6f75e60 commit 5e119cc

7 files changed

Lines changed: 10 additions & 7 deletions

File tree

pixi.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,17 @@ python = "==3.12"
4242
mojo = "<1.0.0" # includes `mojo-compiler`, lsp, debugger, formatter etc.
4343
<<<<<<< HEAD
4444
<<<<<<< HEAD
45+
<<<<<<< HEAD
4546
max = "==26.3.0.dev2026033105"
4647
=======
4748
max = "==26.3.0.dev2026032405"
4849
>>>>>>> 11c7cd4 (Mdoc/fixes (#235))
4950
=======
5051
max = "==26.3.0.dev2026033105"
5152
>>>>>>> d09bc3f (Update all implicit type casts to be explicit (#237))
53+
=======
54+
max = "==26.3.0.dev2026042005"
55+
>>>>>>> ff53970 (update atomic import (#242))
5256
bash = ">=5.2.21,<6"
5357
manim = ">=0.18.1,<0.19"
5458
mdbook = ">=0.4.48,<0.5"

problems/p22/op/layernorm_linear.mojo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from std.math import sqrt
22
from std.gpu import thread_idx, block_idx, block_dim, barrier
33
from std.gpu.memory import AddressSpace, async_copy_wait_all
4-
from std.os.atomic import Atomic
4+
from std.atomic import Atomic
55
from layout import TileTensor
66
from layout.tile_layout import row_major, TensorLayout
77
from layout.tile_tensor import stack_allocation

problems/p27/p27.mojo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from std.gpu import thread_idx, block_idx, block_dim, grid_dim, barrier
2-
from std.os.atomic import Atomic
2+
from std.atomic import Atomic
33
from std.gpu.primitives.warp import WARP_SIZE
44
from std.gpu.primitives import block
55
from std.gpu.host import DeviceContext

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version = "1.0.0"
44
readme = "README.md"
55
requires-python = ">=3.10,<3.13"
66
dependencies = [
7-
"mojo>=0.26.3.0.dev2026033105,<1.0.0",
8-
"max==26.3.0.dev2026033105",
7+
"mojo>=0.26.3.0.dev2026042005,<1.0.0",
8+
"max==26.3.0.dev2026042005",
99
"poethepoet>=0.34.0",
1010
"scipy>=1.15.3",
1111
"torch==2.7.1",

solutions/p10/p10.mojo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ from layout.tile_layout import row_major
66
from layout.tile_tensor import stack_allocation
77
from std.testing import assert_equal
88
from std.sys import argv
9-
from std.os.atomic import Atomic
109

1110
# ANCHOR: shared_memory_race_solution
1211

solutions/p22/op/layernorm_linear.mojo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from std.math import sqrt
22
from std.gpu import thread_idx, block_idx, block_dim, barrier
33
from std.gpu.memory import AddressSpace
4-
from std.os.atomic import Atomic
4+
from std.atomic import Atomic
55
from layout import TileTensor
66
from layout.tile_layout import row_major, TensorLayout
77
from layout.tile_tensor import stack_allocation

solutions/p27/p27.mojo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from std.gpu import thread_idx, block_idx, block_dim, grid_dim, barrier
2-
from std.os.atomic import Atomic
2+
from std.atomic import Atomic
33
from std.gpu.primitives.warp import WARP_SIZE
44
from std.gpu.primitives import block
55
from std.gpu.host import DeviceContext

0 commit comments

Comments
 (0)