Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
154d427
typo.
bimalgaudel Apr 16, 2024
2bfd5aa
More corner cases of ToT evaluations supported.
bimalgaudel Apr 17, 2024
92e416e
Fix `ToT times ToT into T` kind of evaluations so that varying inner …
bimalgaudel May 1, 2024
93f6986
Bug fix.
bimalgaudel May 1, 2024
2e67af6
Simplify `(H+E,H)->H+E` logic.
bimalgaudel May 7, 2024
1e07eb0
[skip ci] Add corner case of outer Hadamard and inner outer-product k…
bimalgaudel May 8, 2024
3a68f0c
bug fix.
bimalgaudel May 8, 2024
6942120
Outer tensor contraction logic update.
bimalgaudel May 10, 2024
95bdee5
Try using latest-stable xcode in CI.
bimalgaudel May 15, 2024
1607ab4
use gcc@11 in CI
bimalgaudel May 15, 2024
ecd4caf
use gcc@11 in CI [ammend]
bimalgaudel May 15, 2024
ec51ab0
Try setting GNU/gcc compiler from `/opt/homebrew/bin`.
bimalgaudel May 15, 2024
40705d7
Avoid using deprecated `TA::Array` typedef.
bimalgaudel May 16, 2024
6e864eb
`reduce_modes` function impl. amended to handle sparse dist-arrays.
bimalgaudel May 16, 2024
02c9ba9
Refactor OuterInnerIndices to OuterInnerSetup.
bimalgaudel May 20, 2024
f00c2dc
Make dense_array.set(..) more generic.
bimalgaudel May 20, 2024
4855438
Amend make dense_array.set(..) more generic.
bimalgaudel May 21, 2024
00663f8
Amend make dense_array.set(..) more generic.
bimalgaudel May 21, 2024
4b3f39f
Remove use of deprecated typedefs.. (moar)
bimalgaudel May 21, 2024
c94488e
Use of `ArrayIterator::ordinal()` changed to `ArrayIterator::index()`…
bimalgaudel May 21, 2024
1dea346
Bug fix.
bimalgaudel May 22, 2024
44f8ec3
Compare shape by default on Sparse policy distarrays.
bimalgaudel May 28, 2024
c9cc69f
Return zero norm for uninitialized tensor-of-tensors tile.
bimalgaudel May 29, 2024
fa242b4
Recompute shape for specially handled sparse arrays in einsum.
bimalgaudel May 29, 2024
64dbcb1
Bug fix.
bimalgaudel May 29, 2024
179e1d3
Sparse array evaluation support in manual eval from tot_array_fixture.
bimalgaudel Jun 3, 2024
59fbafb
Add dox.
bimalgaudel Jun 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
fail-fast: false
matrix:
os : [ macos-latest ]
cxx : [ clang++, /usr/local/bin/g++-10 ]
cxx : [ clang++, /opt/homebrew/bin/g++-11 ]
build_type : [ Release, Debug ]
task_backend: [ Pthreads, PaRSEC ]
prerequisites : [ gcc@10 boost eigen open-mpi bison scalapack ]
prerequisites : [ gcc@11 boost eigen open-mpi bison scalapack ]

name: "${{ matrix.os }}: ${{ matrix.cxx }} ${{ matrix.build_type }} ${{ matrix.task_backend }}"
runs-on: ${{ matrix.os }}
Expand All @@ -35,7 +35,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '<14'
xcode-version: 'latest-stable'

- name: Host system info
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions src/TiledArray/conversions/dense_to_sparse.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ to_sparse(DistArray<Tile, ArgPolicy> const &dense_array) {
const auto begin = dense_array.begin();
for (auto it = begin; it != end; ++it) {
// write the norm of each local tile to the tensor
norm(it->get(), tile_norms[it.ordinal()]);
norm(it->get(), tile_norms[it.index()]);
}

// Construct a sparse shape the constructor will handle communicating the
Expand All @@ -40,9 +40,9 @@ to_sparse(DistArray<Tile, ArgPolicy> const &dense_array) {
// sparse_array set the sparse array tile with a clone so as not to hold
// a pointer to the original tile.
for (auto it = begin; it != end; ++it) {
const auto ord = it.ordinal();
if (!sparse_array.is_zero(ord)) {
sparse_array.set(ord, it->get().clone());
const auto ix = it.index();
if (!sparse_array.is_zero(ix)) {
sparse_array.set(ix, it->get().clone());
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/TiledArray/conversions/sparse_to_dense.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ to_dense(DistArray<Tile, ArgPolicy> const& sparse_array) {
Tile tile(sparse_array.find(ord).get().clone());
dense_array.set(ord, tile);
} else {
// see DistArray::set(ordinal, element_type)
dense_array.set(ord, 0);
dense_array.set(ord, typename Tile::value_type{});
}
}

Expand Down
Loading