Skip to content

Commit 1627eb3

Browse files
authored
updating imex (#77)
* updating imex and CI
1 parent 783b38b commit 1627eb3

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ defaults:
66
shell: bash
77
jobs:
88
build_and_test:
9-
runs-on: [self-hosted, dds-base]
9+
runs-on: tpi-ubuntu-latest
1010
strategy:
1111
fail-fast: false
1212
steps:
@@ -30,13 +30,14 @@ jobs:
3030
id: cache-miniconda
3131
uses: actions/cache@v3
3232
env:
33-
MINICONDA_CACHE_NUMBER: 1 # Increase to reset cache
33+
MINICONDA_CACHE_NUMBER: 2 # Increase to reset cache
3434
with:
3535
path: third_party/install/miniconda/**
3636
key: ${{ runner.os }}-miniconda-${{ env.MINICONDA_CACHE_NUMBER }}-${{ hashFiles('conda-env.yml') }}
3737
- name: Miniconda
3838
if: steps.cache-miniconda.outputs.cache-hit != 'true'
3939
run: |
40+
rm -rf "$GITHUB_WORKSPACE"/third_party/install/miniconda
4041
mkdir -p "$GITHUB_WORKSPACE"/third_party/install
4142
cd "$GITHUB_WORKSPACE"/third_party
4243
wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh

imex_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a84e52b9c5074a71f9b935cf7f0c0384b462f3bd
1+
2875ae696359f267571a77ea774d81659a10d667

src/ManipOp.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ struct DeferredToDevice : public Deferred {
153153

154154
bool generate_mlir(::mlir::OpBuilder &builder, const ::mlir::Location &loc,
155155
jit::DepManager &dm) override {
156-
auto av = dm.getDependent(builder, _a);
156+
auto av = dm.getDependent(builder, Registry::get(_a));
157157

158158
auto srcType = av.getType().dyn_cast<::imex::ndarray::NDArrayType>();
159159
assert(srcType);
@@ -183,12 +183,12 @@ struct DeferredToDevice : public Deferred {
183183
void *r_allocated, void *r_aligned, intptr_t r_offset,
184184
const intptr_t *r_sizes, const intptr_t *r_strides,
185185
uint64_t *lo_allocated, uint64_t *lo_aligned) {
186-
auto t = mk_tnsr(reinterpret_cast<Transceiver *>(this->team()),
187-
_dtype, this->shape(), l_allocated, l_aligned,
188-
l_offset, l_sizes, l_strides, o_allocated,
189-
o_aligned, o_offset, o_sizes, o_strides,
190-
r_allocated, r_aligned, r_offset, r_sizes,
191-
r_strides, lo_allocated, lo_aligned);
186+
auto t = mk_tnsr(this->guid(), this->dtype(), this->shape(),
187+
this->device(), this->team(), l_allocated,
188+
l_aligned, l_offset, l_sizes, l_strides,
189+
o_allocated, o_aligned, o_offset, o_sizes,
190+
o_strides, r_allocated, r_aligned, r_offset,
191+
r_sizes, r_strides, lo_allocated, lo_aligned);
192192
this->set_value(std::move(t));
193193
});
194194
return false;

0 commit comments

Comments
 (0)