Skip to content

Commit

Permalink
ci: Use hash origin/devito/backport - 282589
Browse files Browse the repository at this point in the history
  • Loading branch information
georgebisbas committed Nov 17, 2023
1 parent bd3b60a commit ef9630e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-mlir-mpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
pip install -e .[tests]
pip install mpi4py
pip install xdsl==0.14
pip install git+https://github.com/xdslproject/xdsl@2825897b87443c9369abf89871f4721e2fce2da9
- name: Test with MPI
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-mlir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
pip install -e .[tests]
pip install mpi4py
pip install xdsl==0.14
pip install git+https://github.com/xdslproject/xdsl@2825897b87443c9369abf89871f4721e2fce2da9
- name: Test non-MPI
run: |
Expand Down
7 changes: 4 additions & 3 deletions devito/ir/ietxdsl/cluster_to_ssa.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@ def _convert_eq(self, eq: LoweredEq):
# (for derivative regions)
halo = [function.halo[function.dimensions.index(d)] for d in grid.dimensions]

# shift all time values so that for all accesses at t + n, n>=0.
# Shift all time values so that for all accesses at t + n, n>=0.
self.time_offs = min(
int(idx.indices[0] - grid.stepping_dim) for idx in retrieve_indexed(eq)
)
# calculate the actual size of our time dimension

# Calculate the actual size of our time dimension
actual_time_size = (
max(int(idx.indices[0] - grid.stepping_dim) for idx in retrieve_indexed(eq))
- self.time_offs
Expand All @@ -71,7 +72,7 @@ def _convert_eq(self, eq: LoweredEq):
loop = self._build_iet_for(grid.stepping_dim, actual_time_size)

# build stencil
perf("Init out stencil Op")
perf("Initialize a stencil Op")
stencil_op = iet_ssa.Stencil.get(
loop.subindice_ssa_vals(),
grid.shape_local,
Expand Down
3 changes: 0 additions & 3 deletions devito/ir/ietxdsl/ietxdsl_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
import ctypes
import numpy
from sympy import Indexed, Integer, Symbol, Add, Eq, Mod, Pow, Mul, Float
import cgen

from typing import Any

import devito.ir.iet.nodes as nodes

from devito import SpaceDimension
from devito.passes.iet.languages.openmp import OmpRegion

from devito.tools import as_list
from devito.tools.utils import as_tuple
from devito.types.basic import IndexedData

# XDSL specific imports
Expand Down
6 changes: 3 additions & 3 deletions devito/ir/ietxdsl/lowering.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from dataclasses import dataclass, field
from xdsl.ir import Block, Attribute, BlockArgument, SSAValue, Operation, OpResult
from xdsl.ir import Block, SSAValue, Operation, OpResult
from xdsl.dialects import builtin, scf, arith, func, llvm, memref
from xdsl.dialects.experimental import math

from devito.ir.ietxdsl import iet_ssa

from xdsl.pattern_rewriter import RewritePattern, PatternRewriter, GreedyRewritePatternApplier, op_type_rewrite_pattern, PatternRewriteWalker
from xdsl.pattern_rewriter import (RewritePattern, PatternRewriter, PatternRewriteWalker,
GreedyRewritePatternApplier, op_type_rewrite_pattern)


def _generate_subindices(subindices: int, block: Block,
Expand Down

0 comments on commit ef9630e

Please sign in to comment.