From e365483dc4b494e26ead5add4113149b669e3003 Mon Sep 17 00:00:00 2001 From: Willow Ahrens Date: Fri, 8 Nov 2024 08:21:52 -0500 Subject: [PATCH] fix --- .github/workflows/CI.yml | 2 +- Project.toml | 2 +- src/FinchNotation/syntax.jl | 1 + src/architecture.jl | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ce3d211f3..f679a615f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: version: - - '1.6.7' + - '1.10.6' - '1' os: - ubuntu-latest diff --git a/Project.toml b/Project.toml index 1e833c22f..7afb4fef4 100644 --- a/Project.toml +++ b/Project.toml @@ -50,7 +50,7 @@ TOML = "1.0" TensorMarket = "0.2" UUIDs = "1.4" UnsafeAtomics = "0.2.1" -julia = "1.6.7" +julia = "1.10" [extras] ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" diff --git a/src/FinchNotation/syntax.jl b/src/FinchNotation/syntax.jl index f529f66b8..896f02f94 100644 --- a/src/FinchNotation/syntax.jl +++ b/src/FinchNotation/syntax.jl @@ -58,6 +58,7 @@ struct InitWriter{Vf} end (f::InitWriter{Vf})(x) where {Vf} = x function (f::InitWriter{Vf})(x, y) where {Vf} + (x, y) = promote(x, y) @debug begin @assert isequal(x, Vf) end diff --git a/src/architecture.jl b/src/architecture.jl index 9f7498ea4..65c4b2bc1 100644 --- a/src/architecture.jl +++ b/src/architecture.jl @@ -171,13 +171,13 @@ function moveto(vec::CPULocalVector, task::CPUThread) return temp end -function atomic_modify!(::Serial, vec, idx, op, x) +@propagate_inbounds function atomic_modify!(::Serial, vec, idx, op, x) @inbounds begin vec[idx] = op(vec[idx], x) end end -function atomic_modify!(::CPU, vec, idx, op, x) +@propagate_inbounds function atomic_modify!(::CPU, vec, idx, op, x) Base.unsafe_modify!(pointer(vec, idx), op, x, :sequentially_consistent) end