Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Locks TA version and fixes initialization error #160

Merged
merged 3 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cpp_find_or_build_dependency(
cpp_find_or_build_dependency(
tiledarray
URL github.com/ValeevGroup/tiledarray
VERSION tot_devel
VERSION ba3bef6d8abb4d00d500593585e0f23ad72b980d
BUILD_TARGET tiledarray
FIND_TARGET tiledarray
)
Expand Down
3 changes: 2 additions & 1 deletion libchemist/sparse_map/from_sparse_map.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ auto make_tot_tile_(TileType tile,
}

const auto& d = sm.at(oeidx); // The elements in the inner tile
inner_tile_t buffer(TA::Range(d.result_extents()));
inner_tile_t buffer(TA::Range(d.result_extents()), 0.0);

// Determine tiles to retrieve using injected domain
// TODO: This is just a copy of d if do_inj == false
Expand All @@ -96,6 +96,7 @@ auto make_tot_tile_(TileType tile,
Domain<TileIndex> tdomain(trange, injected_d);

for(const auto& itidx : tdomain) { // Loop over inner-tile indices
if(tensor.is_zero(itidx)) continue;
inner_tile_t t = tensor.find(itidx);

// It's not clear to me whether the injection alters the order. If
Expand Down
2 changes: 0 additions & 2 deletions libchemist/ta_helpers/linalg_inner_tensors.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#pragma once
#include <TiledArray/algebra/cholesky.h>
#include <TiledArray/algebra/heig.h>
#include <libchemist/ta_helpers/get_block_idx.hpp>
#include <tiledarray.h>

Expand Down
1 change: 0 additions & 1 deletion libchemist/ta_helpers/pow.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#pragma once
#include <TiledArray/algebra/heig.h>
#include <algorithm>
#include <cmath>
#include <tiledarray.h>
Expand Down
1 change: 0 additions & 1 deletion libchemist/ta_helpers/remove_redundancy.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#pragma once
#include <TiledArray/algebra/heig.h>
#include <TiledArray/expressions/contraction_helpers.h>
#include <libchemist/ta_helpers/einsum/einsum.hpp>
#include <libchemist/ta_helpers/ta_helpers.hpp>
Expand Down