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.

Sign up for GitHub

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

Refactor lightning_gpu_utils unit tests to remove the dependency on statevector class #675

Merged
merged 7 commits into from
Apr 12, 2024
Merged

Refactor lightning_gpu_utils unit tests to remove the dependency on statevector class #675

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
665fb47
Remove StateVector dependency for utils tests
multiphaseCFD Apr 11, 2024
3621d23
Auto update version
github-actions[bot] Apr 11, 2024
7254de6
update changelog
multiphaseCFD Apr 11, 2024
0dd944b
Merge branch 'clean_LGPU_utils_test' of https://github.com/PennyLaneA…
multiphaseCFD Apr 11, 2024
b08d8d1
add missing header file
multiphaseCFD Apr 11, 2024
ce38a7c
Trigger CIs
multiphaseCFD Apr 11, 2024
f4b611e
Update .github/CHANGELOG.md
multiphaseCFD Apr 11, 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
3 changes: 3 additions & 0 deletions .github/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@

### Improvements

* Refactor lightning_gpu_utils unit tests to remove the dependency on statevector class.
multiphaseCFD marked this conversation as resolved.
Show resolved Hide resolved
[(#675)](https://github.com/PennyLaneAI/pennylane-lightning/pull/675)

* Upgrade GitHub actions versions from v3 to v4.
[(#669)](https://github.com/PennyLaneAI/pennylane-lightning/pull/669)

Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.36.0-dev25"
__version__ = "0.36.0-dev26"
39 changes: 25 additions & 14 deletions pennylane_lightning/core/src/simulators/lightning_gpu/utils/tests/Test_LinearAlgebra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <algorithm>
#include <complex>
#include <cstdio>
#include <vector>

#include <catch2/catch.hpp>

#include "DataBuffer.hpp"
#include "LinearAlg.hpp"
#include "StateVectorCudaManaged.hpp"
#include "TestHelpers.hpp"
#include "Util.hpp" // exp2
#include "cuda_helpers.hpp"

/**
* @file
Expand All @@ -31,25 +33,34 @@
/// @cond DEV
namespace {
using namespace Pennylane::LightningGPU;
using namespace Pennylane::LightningGPU::Util;
using namespace Pennylane::Util;
} // namespace
/// @endcond

TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
double) {
using StateVectorT = StateVectorCudaManaged<TestType>;
using ComplexT = StateVectorT::ComplexT;
using CFP_t = StateVectorT::CFP_t;
using ComplexT = std::complex<TestType>;
using IdxT = typename std::conditional<std::is_same<TestType, float>::value,
int32_t, int64_t>::type;

using CFP_t =
typename std::conditional<std::is_same<TestType, float>::value,
cuFloatComplex, cuDoubleComplex>::type;

std::size_t num_qubits = 3;
std::size_t data_size = exp2(num_qubits);

std::vector<ComplexT> vectors = {{0.0, 0.0}, {0.0, 0.1}, {0.1, 0.1},
{0.1, 0.2}, {0.2, 0.2}, {0.3, 0.3},
{0.3, 0.4}, {0.4, 0.5}};

std::vector<CFP_t> vectors_cu;

std::transform(vectors.begin(), vectors.end(),
std::back_inserter(vectors_cu),
[](ComplexT x) { return complexToCu<ComplexT>(x); });

const std::vector<ComplexT> result_refs = {
{0.2, -0.1}, {-0.1, 0.2}, {0.2, 0.1}, {0.1, 0.2},
{0.7, -0.2}, {-0.1, 0.6}, {0.6, 0.1}, {0.2, 0.7}};
Expand All @@ -63,26 +74,26 @@ TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
{1.0, 0.0}, {0.0, -1.0}, {1.0, 0.0}, {0.0, 1.0},
{0.0, -1.0}, {1.0, 0.0}, {0.0, 1.0}, {1.0, 0.0}};

StateVectorT sv_x{num_qubits};
StateVectorT sv_y{num_qubits};
DataBuffer<CFP_t> sv_x(data_size);
DataBuffer<CFP_t> sv_y(data_size);

sv_x.CopyHostDataToGpu(vectors.data(), vectors.size());
sv_x.CopyHostDataToGpu(vectors_cu.data(), vectors_cu.size());

SECTION("Testing sparse matrix vector product:") {
std::vector<ComplexT> result(data_size);
std::vector<CFP_t> result(data_size);
auto cusparsehandle = make_shared_cusparse_handle();

cuUtil::SparseMV_cuSparse<IdxT, TestType, CFP_t>(
SparseMV_cuSparse<IdxT, TestType, CFP_t>(
indptr.data(), static_cast<int64_t>(indptr.size()), indices.data(),
values.data(), static_cast<int64_t>(values.size()), sv_x.getData(),
sv_y.getData(), sv_x.getDataBuffer().getDevTag().getDeviceID(),
sv_x.getDataBuffer().getDevTag().getStreamID(),
sv_x.getCusparseHandle());
sv_y.getData(), sv_x.getDevice(), sv_x.getStream(),
cusparsehandle.get());

sv_y.CopyGpuDataToHost(result.data(), result.size());

for (std::size_t j = 0; j < exp2(num_qubits); j++) {
CHECK(imag(result[j]) == Approx(imag(result_refs[j])));
CHECK(real(result[j]) == Approx(real(result_refs[j])));
CHECK(result[j].x == Approx(real(result_refs[j])));
CHECK(result[j].y == Approx(imag(result_refs[j])));
}
}
}
50 changes: 31 additions & 19 deletions ...ane_lightning/core/src/simulators/lightning_gpu/utils/tests/mpi/Test_LinearAlgebraMPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,39 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <algorithm>
#include <complex>
#include <cstdio>
#include <vector>

#include <catch2/catch.hpp>

#include "DataBuffer.hpp"
#include "MPILinearAlg.hpp"
#include "MPIManager.hpp"
#include "StateVectorCudaMPI.hpp"
#include "TestHelpers.hpp"
#include "Util.hpp" // exp2
#include "cuda_helpers.hpp"

/**
* @file
* Tests linear algebra functionality defined for the class StateVectorCudaMPI.
* Tests distributed linear algebra functionality.
*/

/// @cond DEV
namespace {
using namespace Pennylane::LightningGPU;
using namespace Pennylane::LightningGPU::Util;
using namespace Pennylane::Util;
} // namespace
/// @endcond

TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
double) {
using StateVectorT = StateVectorCudaMPI<TestType>;
using ComplexT = StateVectorT::ComplexT;
using CFP_t = StateVectorT::CFP_t;
using ComplexT = std::complex<TestType>;
using CFP_t =
typename std::conditional<std::is_same<TestType, float>::value,
cuFloatComplex, cuDoubleComplex>::type;
using IdxT = typename std::conditional<std::is_same<TestType, float>::value,
int32_t, int64_t>::type;

Expand All @@ -52,6 +56,11 @@ TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
{0.1, 0.2}, {0.2, 0.2}, {0.3, 0.3},
{0.3, 0.4}, {0.4, 0.5}};

std::vector<CFP_t> state_cu;

std::transform(state.begin(), state.end(), std::back_inserter(state_cu),
[](ComplexT x) { return complexToCu(x); });

std::vector<ComplexT> result_refs = {{0.2, -0.1}, {-0.1, 0.2}, {0.2, 0.1},
{0.1, 0.2}, {0.7, -0.2}, {-0.1, 0.6},
{0.6, 0.1}, {0.2, 0.7}};
Expand All @@ -65,7 +74,6 @@ TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
{1.0, 0.0}, {0.0, -1.0}, {1.0, 0.0}, {0.0, 1.0},
{0.0, -1.0}, {1.0, 0.0}, {0.0, 1.0}, {1.0, 0.0}};

size_t mpi_buffersize = 1;
size_t nGlobalIndexBits =
std::bit_width(static_cast<size_t>(mpi_manager.getSize())) - 1;
size_t nLocalIndexBits = num_qubits - nGlobalIndexBits;
Expand All @@ -80,6 +88,12 @@ TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
subSvLength, 0);
mpi_manager.Barrier();

std::vector<CFP_t> local_state_cu;

std::transform(local_state.begin(), local_state.end(),
std::back_inserter(local_state_cu),
[](ComplexT x) { return complexToCu(x); });

int nDevices = 0;
cudaGetDeviceCount(&nDevices);
REQUIRE(nDevices >= 2);
Expand All @@ -89,29 +103,27 @@ TEMPLATE_TEST_CASE("Linear Algebra::SparseMV", "[Linear Algebra]", float,
mpi_manager.Barrier();

SECTION("Testing sparse matrix vector product:") {
std::vector<ComplexT> local_result(local_state.size());
std::vector<CFP_t> local_result(local_state.size());
auto cusparsehandle = make_shared_cusparse_handle();

DataBuffer<CFP_t> sv_x(local_state.size());
DataBuffer<CFP_t> sv_y(local_state.size());

StateVectorT sv_x(mpi_manager, dt_local, mpi_buffersize,
nGlobalIndexBits, nLocalIndexBits);
StateVectorT sv_y(mpi_manager, dt_local, mpi_buffersize,
nGlobalIndexBits, nLocalIndexBits);
sv_x.CopyHostDataToGpu(local_state, false);
sv_x.CopyHostDataToGpu(local_state_cu.data(), local_state_cu.size());

cuUtil::SparseMV_cuSparseMPI<IdxT, TestType, CFP_t>(
SparseMV_cuSparseMPI<IdxT, TestType, CFP_t>(
mpi_manager, sv_x.getLength(), indptr.data(),
static_cast<int64_t>(indptr.size()), indices.data(), values.data(),
sv_x.getData(), sv_y.getData(),
sv_x.getDataBuffer().getDevTag().getDeviceID(),
sv_x.getDataBuffer().getDevTag().getStreamID(),
sv_x.getCusparseHandle());
sv_x.getData(), sv_y.getData(), sv_x.getDevice(), sv_x.getStream(),
cusparsehandle.get());

mpi_manager.Barrier();

sv_y.CopyGpuDataToHost(local_result.data(), local_result.size());

for (std::size_t j = 0; j < local_result.size(); j++) {
CHECK(imag(local_result[j]) == Approx(imag(local_result_refs[j])));
CHECK(real(local_result[j]) == Approx(real(local_result_refs[j])));
CHECK(local_result[j].y == Approx(imag(local_result_refs[j])));
CHECK(local_result[j].x == Approx(real(local_result_refs[j])));
}
}
}
Loading