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

Bugfix #1

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bugfix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f1ec5
Correctly generate uniform distribution
DapperX Jul 24, 2022
d5082aa
Correctly handle the '--small' flag
DapperX Jul 24, 2022
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
4 changes: 2 additions & 2 deletions examples/microbenchmarks/blocksize_tuning/eval_microbenchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import settings

parser = argparse.ArgumentParser(description='Run microbenchmarks')
parser.add_argument('--small', action="store_false", help='use small-size inputs')
parser.add_argument('--small', action="store_true", help='use small-size inputs')

args = parser.parse_args()
use_large = True
tests = settings.large_tests
if (args.small != None):
if args.small:
use_large = False
tests = settings.small_tests

Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/blocksize_tuning/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# Run tests based on settings and generate raw_output files.

parser = argparse.ArgumentParser(description='Run microbenchmarks')
parser.add_argument('--small', action="store_false", help='use small-size inputs')
parser.add_argument('--small', action="store_true", help='use small-size inputs')

args = parser.parse_args()
use_large = True
tests = settings.large_tests
if (args.small != None):
if args.small:
use_large = False
tests = settings.small_tests

Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/blocksize_vs_space/eval_microbenchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import settings

parser = argparse.ArgumentParser(description='Run microbenchmarks')
parser.add_argument('--small', action="store_false", help='use small-size inputs')
parser.add_argument('--small', action="store_true", help='use small-size inputs')

args = parser.parse_args()
use_large = True
tests = settings.large_tests
if (args.small != None):
if args.small:
use_large = False
tests = settings.small_tests

Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/blocksize_vs_space/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# Run tests based on settings and generate raw_output files.

parser = argparse.ArgumentParser(description='Run microbenchmarks')
parser.add_argument('--small', action="store_false", help='use small-size inputs')
parser.add_argument('--small', action="store_true", help='use small-size inputs')

args = parser.parse_args()
use_large = True
tests = settings.large_tests
if (args.small != None):
if args.small:
use_large = False
tests = settings.small_tests

Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/experiments/eval_microbenchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
tab = {}

parser = argparse.ArgumentParser(description='Run microbenchmarks')
parser.add_argument('--small', action="store_false", help='use small-size inputs')
parser.add_argument('--small', action="store_true", help='use small-size inputs')

args = parser.parse_args()
use_large = True
unaug_tests = settings.large_unaug_tests
aug_tests = settings.large_aug_tests
if (args.small != None):
if args.small:
use_large = False
unaug_tests = settings.small_unaug_tests
aug_tests = settings.small_aug_tests
Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/experiments/run_microbenchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
# Run tests based on settings and generate raw_output files.

parser = argparse.ArgumentParser(description='Run microbenchmarks')
parser.add_argument('--small', action="store_false", help='use small-size inputs')
parser.add_argument('--small', action="store_true", help='use small-size inputs')

args = parser.parse_args()
use_large = True
unaug_tests = settings.large_unaug_tests
aug_tests = settings.large_aug_tests
if (args.small != None):
if args.small:
use_large = False
unaug_tests = settings.small_unaug_tests
aug_tests = settings.small_aug_tests
Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/testParallel-PAM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ std::mt19937_64& get_rand_gen() {
parlay::sequence<par> uniform_input(size_t n, size_t window,
bool shuffle = false) {
auto g = [&](size_t i) {
uniform_int_distribution<> r_keys(1, window);
uniform_int_distribution<size_t> r_keys(1, window);
key_type key = r_keys(get_rand_gen());
key_type val = i;
return make_pair(key, val);
Expand All @@ -113,7 +113,7 @@ parlay::sequence<par> uniform_input(size_t n, size_t window,

parlay::sequence<par> uniform_input_unsorted(size_t n, size_t window) {
auto f = [&](size_t i) {
uniform_int_distribution<> r_keys(1, window);
uniform_int_distribution<size_t> r_keys(1, window);
key_type k = r_keys(get_rand_gen());
key_type c = r_keys(get_rand_gen());
return make_pair(k, c);
Expand Down
4 changes: 2 additions & 2 deletions examples/microbenchmarks/testParallel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ std::mt19937_64& get_rand_gen() {
parlay::sequence<par> uniform_input(size_t n, size_t window,
bool shuffle = false) {
auto g = [&](size_t i) {
uniform_int_distribution<> r_keys(1, window);
uniform_int_distribution<size_t> r_keys(1, window);
key_type key = r_keys(get_rand_gen());
key_type val = i;
return make_pair(key, val);
Expand All @@ -123,7 +123,7 @@ parlay::sequence<par> uniform_input(size_t n, size_t window,

parlay::sequence<par> uniform_input_unsorted(size_t n, size_t window) {
auto f = [&](size_t i) {
uniform_int_distribution<> r_keys(1, window);
uniform_int_distribution<size_t> r_keys(1, window);
key_type k = r_keys(get_rand_gen());
key_type c = r_keys(get_rand_gen());
return make_pair(k, c);
Expand Down