Skip to content

Commit 5a0f6f4

Browse files
committed
migrated DATASET_SIZE to AMOUNT_OF_CIRCUITS
1 parent c1c718a commit 5a0f6f4

File tree

5 files changed

+38
-23
lines changed

5 files changed

+38
-23
lines changed

args/parser.py

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
DEFAULT_MAX_TOTAL_GATES,
1212
DEFAULT_THREADS,
1313
DEFAULT_BATCH_SIZE,
14-
DEFAULT_DATASET_SIZE,
14+
DEFAULT_AMOUNT_OF_CIRCUITS,
1515
DEFAULT_NEW_DIM,
1616
DEFAULT_TRAIN_PERCENTAGE,
1717
DEFAULT_TEST_PERCENTAGE,
@@ -24,6 +24,21 @@
2424
class Arguments:
2525
"""Parsed args types"""
2626

27+
__slots__ = [
28+
"_epochs",
29+
"_batch_size",
30+
"_train_size",
31+
"_test_size",
32+
"_threads",
33+
"_shots",
34+
"_n_qubits",
35+
"_max_gates",
36+
"_amount_circuits",
37+
"_target_folder",
38+
"_checkpoint",
39+
"_new_image_dim"
40+
]
41+
2742
def __init__(self):
2843
"""set default arguments"""
2944

@@ -35,7 +50,7 @@ def __init__(self):
3550
self._shots = DEFAULT_SHOTS
3651
self._n_qubits = DEFAULT_NUM_QUBITS
3752
self._max_gates = DEFAULT_MAX_TOTAL_GATES
38-
self._dataset_size = DEFAULT_DATASET_SIZE
53+
self._amount_circuits = DEFAULT_AMOUNT_OF_CIRCUITS
3954
self._target_folder = DEFAULT_TARGET_FOLDER
4055
self._checkpoint = DEFAULT_CHECKPOINT
4156
self._new_image_dim = DEFAULT_NEW_DIM
@@ -50,7 +65,7 @@ def parse(self, args: argparse.Namespace):
5065
self._shots = args.shots
5166
self._n_qubits = args.n_qubits
5267
self._max_gates = args.max_gates
53-
self._dataset_size = args.dataset_size
68+
self._amount_circuits = args.amount_circuits
5469
self._target_folder = args.target_folder
5570
self._checkpoint = args.checkpoint
5671
self._new_image_dim = args.new_image_dim
@@ -136,14 +151,14 @@ def max_gates(self, value: int):
136151
self._max_gates = value
137152

138153
@property
139-
def dataset_size(self) -> int:
140-
"""Get dataset_size data"""
141-
return self._dataset_size # type: ignore
154+
def amount_circuits(self) -> int:
155+
"""Get amount_circuits data"""
156+
return self._amount_circuits # type: ignore
142157

143-
@dataset_size.setter
144-
def dataset_size(self, value: int):
145-
"""Set dataset_size data"""
146-
self._dataset_size = value
158+
@amount_circuits.setter
159+
def amount_circuits(self, value: int):
160+
"""Set amount_circuits data"""
161+
self._amount_circuits = value
147162

148163
@property
149164
def target_folder(self) -> FilePath:
@@ -184,7 +199,7 @@ def __str__(self) -> str:
184199
string += f"shots: {self._shots}\n"
185200
string += f"n qubits: {self._n_qubits}\n"
186201
string += f"max gates: {self._max_gates}\n"
187-
string += f"dataset size: {self._dataset_size}\n"
202+
string += f"amount circuits: {self._amount_circuits}\n"
188203
string += f"target_folder: {self._target_folder}\n"
189204
string += f"checkpoint: {self._checkpoint}\n"
190205
string += f"new image dim: {self._new_image_dim}\n"
@@ -210,7 +225,7 @@ def parse_args() -> Arguments:
210225
parser.add_argument("--n-qubits", type=int, default=DEFAULT_NUM_QUBITS)
211226
parser.add_argument("--max-gates", type=int, default=DEFAULT_MAX_TOTAL_GATES)
212227

213-
parser.add_argument("--dataset-size", type=int, default=DEFAULT_DATASET_SIZE)
228+
parser.add_argument("--amount-circuits", type=int, default=DEFAULT_AMOUNT_OF_CIRCUITS)
214229
parser.add_argument("--target-folder", type=str, default=DEFAULT_TARGET_FOLDER)
215230
parser.add_argument("--new-image-dim", type=int, nargs=2, default=DEFAULT_NEW_DIM)
216231

dags/dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
DEFAULT_NEW_DIM,
2626
DEFAULT_MAX_TOTAL_GATES,
2727
DEFAULT_SHOTS,
28-
DEFAULT_DATASET_SIZE,
28+
DEFAULT_AMOUNT_OF_CIRCUITS,
2929
DEFAULT_THREADS,
3030
images_gen_checkpoint_file,
3131
)
@@ -117,7 +117,7 @@ def update_checkpoint(checkpoint: Checkpoint, stage: Stages):
117117
DEFAULT_NUM_QUBITS,
118118
DEFAULT_MAX_TOTAL_GATES,
119119
DEFAULT_SHOTS,
120-
DEFAULT_DATASET_SIZE,
120+
DEFAULT_AMOUNT_OF_CIRCUITS,
121121
DEFAULT_THREADS,
122122
checkpoint,
123123
],

dataset.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def generate_images(
244244
n_qubits: int,
245245
total_gates: int,
246246
shots: int,
247-
dataset_size: int,
247+
amount_circuits: int,
248248
total_threads: int,
249249
checkpoint: Checkpoint,
250250
):
@@ -270,8 +270,8 @@ def generate_images(
270270
base_dataset_path = dataset_path(target_folder)
271271

272272
index = checkpoint.index
273-
with tqdm(total=dataset_size, initial=index) as progress:
274-
while index < dataset_size:
273+
with tqdm(total=amount_circuits, initial=index) as progress:
274+
while index < amount_circuits:
275275
args = []
276276

277277
for i in range(total_threads):
@@ -477,7 +477,7 @@ def main(args: Arguments):
477477
args.n_qubits,
478478
args.max_gates,
479479
args.shots,
480-
args.dataset_size,
480+
args.amount_circuits,
481481
args.threads,
482482
checkpoint,
483483
)

tests/test_args.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from utils.constants import (
55
DEFAULT_BATCH_SIZE,
66
DEFAULT_CHECKPOINT,
7-
DEFAULT_DATASET_SIZE,
7+
DEFAULT_AMOUNT_OF_CIRCUITS,
88
DEFAULT_EPOCHS,
99
DEFAULT_MAX_TOTAL_GATES,
1010
DEFAULT_NEW_DIM,
@@ -39,7 +39,7 @@ def test_default_values(self):
3939

4040
assert args.batch_size == DEFAULT_BATCH_SIZE
4141
assert args.checkpoint == DEFAULT_CHECKPOINT
42-
assert args.dataset_size == DEFAULT_DATASET_SIZE
42+
assert args.amount_circuits == DEFAULT_AMOUNT_OF_CIRCUITS
4343
assert args.epochs == DEFAULT_EPOCHS
4444
assert args.max_gates == DEFAULT_MAX_TOTAL_GATES
4545
assert args.n_qubits == DEFAULT_NUM_QUBITS
@@ -71,7 +71,7 @@ def test_arbitrary_arguments(self):
7171
"6",
7272
"--max-gates",
7373
"103",
74-
"--dataset-size",
74+
"--amount-circuits",
7575
"3233",
7676
"--target-folder",
7777
"another",
@@ -91,6 +91,6 @@ def test_arbitrary_arguments(self):
9191
assert args.shots == int(sys.argv[14])
9292
assert args.n_qubits == int(sys.argv[16])
9393
assert args.max_gates == int(sys.argv[18])
94-
assert args.dataset_size == int(sys.argv[20])
94+
assert args.amount_circuits == int(sys.argv[20])
9595
assert args.target_folder == sys.argv[22]
9696
assert args.new_image_dim == [int(sys.argv[24]), int(sys.argv[25])]

utils/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
DEFAULT_BATCH_SIZE = 10
1616

17-
DEFAULT_DATASET_SIZE = 20000 # this one doesn't reflect exactly the size of the dataset, once the dataset might get either bigger, due to the different combinations of mesurements, or smaller due to duplicated circuits
17+
DEFAULT_AMOUNT_OF_CIRCUITS = 20000 # this one doesn't reflect exactly the size of the dataset, once the dataset might get either bigger, due to the different combinations of mesurements, or smaller due to duplicated circuits
1818

1919
DEFAULT_TARGET_FOLDER = "."
2020

0 commit comments

Comments
 (0)