Skip to content

Updates/standards and small fixes #1091

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

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ The following simple (C++ style) pseudocode shows how the algorithm is implement
// Between rows
for proper index k {
row1 = load k-th row
row2 = load [k + (1 << wire)]-th row
row2 = load [k + (1U << wire)]-th row
save row2 to k-th row
save row1 to [k + (1 << wire)]-th row
save row1 to [k + (1U << wire)]-th row
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.41.0-dev49"
__version__ = "0.41.0-dev50"
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
/// @cond DEV
namespace {
namespace cuUtil = Pennylane::LightningGPU::Util;
// using namespace Pennylane::Util;
} // namespace
/// @endcond

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,10 @@ TEMPLATE_TEST_CASE("LightningGPU::applyIsingXX", "[LightningGPU_Param]", float,
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits),
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, 0.0};
expected_results[0][6] = {0.0, -0.14943813247359922};

Expand All @@ -495,8 +497,10 @@ TEMPLATE_TEST_CASE("LightningGPU::applyIsingXX", "[LightningGPU_Param]", float,
expected_results[3][5] = {0.0, -0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits),
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, 0.0};
expected_results_adj[0][6] = {0.0, 0.14943813247359922};

Expand Down Expand Up @@ -632,8 +636,10 @@ TEMPLATE_TEST_CASE("LightningGPU::applyIsingYY", "[LightningGPU_Param]", float,
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits),
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, 0.0};
expected_results[0][6] = {0.0, 0.14943813247359922};

Expand All @@ -647,8 +653,10 @@ TEMPLATE_TEST_CASE("LightningGPU::applyIsingYY", "[LightningGPU_Param]", float,
expected_results[3][5] = {0.0, 0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits),
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, 0.0};
expected_results_adj[0][6] = {0.0, -0.14943813247359922};

Expand Down Expand Up @@ -725,13 +733,14 @@ TEMPLATE_TEST_CASE("LightningGPU::applyIsingZZ", "[LightningGPU_Param]", float,
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits, {0, 0}),
std::vector<cp_t>(1 << num_qubits, {0, 0})};
std::vector<cp_t>(1U << num_qubits, {0, 0}),
std::vector<cp_t>(1U << num_qubits, {0, 0})};
expected_results[0][0] = {0.9887710779360422, -0.14943813247359922};
expected_results[1][0] = {0.9210609940028851, -0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, 0.14943813247359922};
expected_results_adj[1][0] = {0.9210609940028851, 0.3894183423086505};

Expand Down Expand Up @@ -973,7 +982,7 @@ TEMPLATE_TEST_CASE("LightningGPU::applySingleExcitation",

const std::vector<TestType> angles{0.3, 0.8};

std::vector<cp_t> expected_results(1 << num_qubits);
std::vector<cp_t> expected_results(1U << num_qubits);
expected_results[0] = {1.0, 0.0};

const auto init_state = sv.getDataVector();
Expand Down Expand Up @@ -1019,12 +1028,14 @@ TEMPLATE_TEST_CASE("LightningGPU::applySingleExcitationMinus",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, -0.14943813247359922};
expected_results[1][0] = {0.9210609940028851, -0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, 0.14943813247359922};
expected_results_adj[1][0] = {0.9210609940028851, 0.3894183423086505};

Expand Down Expand Up @@ -1098,12 +1109,14 @@ TEMPLATE_TEST_CASE("LightningGPU::applySingleExcitationPlus",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, 0.14943813247359922};
expected_results[1][0] = {0.9210609940028851, 0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, -0.14943813247359922};
expected_results_adj[1][0] = {0.9210609940028851, -0.3894183423086505};

Expand Down Expand Up @@ -1176,7 +1189,7 @@ TEMPLATE_TEST_CASE("LightningGPU::applyDoubleExcitation",

const std::vector<TestType> angles{0.3, 0.8, 2.4};

std::vector<cp_t> expected_results(1 << num_qubits);
std::vector<cp_t> expected_results(1U << num_qubits);
expected_results[0] = {1.0, 0.0};

const auto init_state = sv.getDataVector();
Expand Down Expand Up @@ -1214,12 +1227,14 @@ TEMPLATE_TEST_CASE("LightningGPU::applyDoubleExcitationMinus",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, -0.14943813247359922};
expected_results[1][0] = {0.9210609940028851, -0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, 0.14943813247359922};
expected_results_adj[1][0] = {0.9210609940028851, 0.3894183423086505};

Expand Down Expand Up @@ -1269,12 +1284,14 @@ TEMPLATE_TEST_CASE("LightningGPU::applyDoubleExcitationPlus",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, 0.14943813247359922};
expected_results[1][0] = {0.9210609940028851, 0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, -0.14943813247359922};
expected_results_adj[1][0] = {0.9210609940028851, -0.3894183423086505};

Expand Down Expand Up @@ -1324,12 +1341,14 @@ TEMPLATE_TEST_CASE("LightningGPU::applyMultiRZ", "[LightningGPU_Param]", float,
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<cp_t>> expected_results{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results[0][0] = {0.9887710779360422, -0.14943813247359922};
expected_results[1][0] = {0.9210609940028851, -0.3894183423086505};

std::vector<std::vector<cp_t>> expected_results_adj{
std::vector<cp_t>(1 << num_qubits), std::vector<cp_t>(1 << num_qubits)};
std::vector<cp_t>(1U << num_qubits),
std::vector<cp_t>(1U << num_qubits)};
expected_results_adj[0][0] = {0.9887710779360422, 0.14943813247359922};
expected_results_adj[1][0] = {0.9210609940028851, 0.3894183423086505};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1868,10 +1868,10 @@ TEMPLATE_TEST_CASE("StateVectorKokkosManaged::applyIsingXX",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<ComplexT>> expected_results{
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits)};
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits)};
expected_results[0][0] = ComplexT{0.9887710779360422, 0.0};
expected_results[0][6] = ComplexT{0.0, -0.14943813247359922};

Expand Down Expand Up @@ -1950,10 +1950,10 @@ TEMPLATE_TEST_CASE("StateVectorKokkosManaged::applyIsingYY",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<ComplexT>> expected_results{
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits)};
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits)};
expected_results[0][0] = ComplexT{0.9887710779360422, 0.0};
expected_results[0][6] = ComplexT{0.0, 0.14943813247359922};

Expand Down Expand Up @@ -2032,8 +2032,8 @@ TEMPLATE_TEST_CASE("StateVectorKokkosManaged::applyIsingZZ",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<ComplexT>> expected_results{
std::vector<ComplexT>(1 << num_qubits, {0, 0}),
std::vector<ComplexT>(1 << num_qubits, {0, 0})};
std::vector<ComplexT>(1U << num_qubits, {0, 0}),
std::vector<ComplexT>(1U << num_qubits, {0, 0})};
expected_results[0][0] = ComplexT{0.9887710779360422, -0.14943813247359922};
expected_results[1][0] = ComplexT{0.9210609940028851, -0.3894183423086505};

Expand Down Expand Up @@ -2100,8 +2100,8 @@ TEMPLATE_TEST_CASE("StateVectorKokkosManaged::applyMultiRZ",
const std::vector<TestType> angles{0.3, 0.8};

std::vector<std::vector<ComplexT>> expected_results{
std::vector<ComplexT>(1 << num_qubits),
std::vector<ComplexT>(1 << num_qubits)};
std::vector<ComplexT>(1U << num_qubits),
std::vector<ComplexT>(1U << num_qubits)};
expected_results[0][0] = ComplexT{0.9887710779360422, -0.14943813247359922};
expected_results[1][0] = ComplexT{0.9210609940028851, -0.3894183423086505};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <bit>
#include <complex>
#include <functional>
#include <iostream>
#include <string>
#include <tuple>
#include <vector>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ template <typename ComplexT, typename VectorT>
void applyMultiQubitOpRunSparseUnitary(
VectorT &ref_st, SparseMatrixCSR<ComplexT> &sparse_unitary, VectorT &st,
const std::size_t num_qubits, const std::vector<std::size_t> &wires,
const bool inverse, const float margin = 1e-5) {
const bool inverse, const typename ComplexT::value_type margin = 1e-5) {

GateImplementationsLM::applyMultiQubitSparseOp(
st.data(), num_qubits, sparse_unitary.row_map.data(),
Expand Down
Loading
Loading