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

Fix sampling. #663

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Fix sampling. #663

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
465e585
Fix sampling.
sergeisakov Mar 26, 2024
003eba3
Merge branch 'master' into fix-sampling
sergeisakov Mar 26, 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
Next Next commit
Fix sampling.
  • Loading branch information
@sergeisakov
sergeisakov committed Mar 26, 2024
commit 465e5853ef93ba4f9c69ad7e8e18c0cca5d8a484
12 changes: 8 additions & 4 deletions lib/statespace_avx.h
View file
Original file line number Diff line number Diff line change
@@ -382,8 +382,8 @@ class StateSpaceAVX :

for (uint64_t k = 0; k < size; ++k) {
for (unsigned j = 0; j < 8; ++j) {
auto re = p[16 * k + j];
auto im = p[16 * k + 8 + j];
double re = p[16 * k + j];
double im = p[16 * k + 8 + j];
norm += re * re + im * im;
}
}
@@ -396,15 +396,19 @@ class StateSpaceAVX :

for (uint64_t k = 0; k < size; ++k) {
for (unsigned j = 0; j < 8; ++j) {
auto re = p[16 * k + j];
auto im = p[16 * k + 8 + j];
double re = p[16 * k + j];
double im = p[16 * k + 8 + j];
csum += re * re + im * im;
while (rs[m] < csum && m < num_samples) {
bitstrings.emplace_back(8 * k + j);
++m;
}
}
}

for (; m < num_samples; ++m) {
bitstrings.emplace_back((uint64_t{1} << state.num_qubits()) - 1);
}
}

return bitstrings;
12 changes: 8 additions & 4 deletions lib/statespace_avx512.h
View file
Original file line number Diff line number Diff line change
@@ -333,8 +333,8 @@ class StateSpaceAVX512 :

for (uint64_t k = 0; k < size; ++k) {
for (unsigned j = 0; j < 16; ++j) {
auto re = p[32 * k + j];
auto im = p[32 * k + 16 + j];
double re = p[32 * k + j];
double im = p[32 * k + 16 + j];
norm += re * re + im * im;
}
}
@@ -347,15 +347,19 @@ class StateSpaceAVX512 :

for (uint64_t k = 0; k < size; ++k) {
for (unsigned j = 0; j < 16; ++j) {
auto re = p[32 * k + j];
auto im = p[32 * k + 16 + j];
double re = p[32 * k + j];
double im = p[32 * k + 16 + j];
csum += re * re + im * im;
while (rs[m] < csum && m < num_samples) {
bitstrings.emplace_back(16 * k + j);
++m;
}
}
}

for (; m < num_samples; ++m) {
bitstrings.emplace_back((uint64_t{1} << state.num_qubits()) - 1);
}
}

return bitstrings;
12 changes: 8 additions & 4 deletions lib/statespace_basic.h
View file
Original file line number Diff line number Diff line change
@@ -203,8 +203,8 @@ class StateSpaceBasic :
const fp_type* p = state.get();

for (uint64_t k = 0; k < size; ++k) {
auto re = p[2 * k];
auto im = p[2 * k + 1];
double re = p[2 * k];
double im = p[2 * k + 1];
norm += re * re + im * im;
}

@@ -215,14 +215,18 @@ class StateSpaceBasic :
bitstrings.reserve(num_samples);

for (uint64_t k = 0; k < size; ++k) {
auto re = p[2 * k];
auto im = p[2 * k + 1];
double re = p[2 * k];
double im = p[2 * k + 1];
csum += re * re + im * im;
while (rs[m] < csum && m < num_samples) {
bitstrings.emplace_back(k);
++m;
}
}

for (; m < num_samples; ++m) {
bitstrings.emplace_back((uint64_t{1} << state.num_qubits()) - 1);
}
}

return bitstrings;
12 changes: 8 additions & 4 deletions lib/statespace_sse.h
View file
Original file line number Diff line number Diff line change
@@ -342,8 +342,8 @@ class StateSpaceSSE :

for (uint64_t k = 0; k < size; ++k) {
for (unsigned j = 0; j < 4; ++j) {
auto re = p[8 * k + j];
auto im = p[8 * k + 4 + j];
double re = p[8 * k + j];
double im = p[8 * k + 4 + j];
norm += re * re + im * im;
}
}
@@ -356,15 +356,19 @@ class StateSpaceSSE :

for (uint64_t k = 0; k < size; ++k) {
for (unsigned j = 0; j < 4; ++j) {
auto re = p[8 * k + j];
auto im = p[8 * k + 4 + j];
double re = p[8 * k + j];
double im = p[8 * k + 4 + j];
csum += re * re + im * im;
while (rs[m] < csum && m < num_samples) {
bitstrings.emplace_back(4 * k + j);
++m;
}
}
}

for (; m < num_samples; ++m) {
bitstrings.emplace_back((uint64_t{1} << state.num_qubits()) - 1);
}
}

return bitstrings;
Loading