Skip to content

Replace usage of legacy numpy random api with modern api #7985

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

Merged
jenshnielsen merged 6 commits into from
Mar 30, 2026
Merged

Replace usage of legacy numpy random api with modern api #7985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f352f1
Replace legacy np.random calls with np.random.Generator in mock instr…
jenshnielsen Mar 30, 2026
9a6cdc7
Replace legacy np.random calls with np.random.Generator in tests
jenshnielsen Mar 30, 2026
7c9f7c4
Replace legacy np.random calls with np.random.Generator in docs examples
jenshnielsen Mar 30, 2026
8d91b54
Replace legacy np.random.rand with np.random.Generator in benchmarks
jenshnielsen Mar 30, 2026
c14312e
Enable ruff lint rule NPY002 for legacy numpy random API
jenshnielsen Mar 30, 2026
fc53730
Code review
jenshnielsen Mar 30, 2026
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: 2 additions & 1 deletion benchmarking/benchmarks/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ def setup(self, bench_param):
self.datasaver = self.runner.__enter__()

# Create values for parameters
rng = np.random.default_rng()
for _ in range(len(self.parameters)):
self.values.append(np.random.rand(bench_param["n_values"]))
self.values.append(rng.random(bench_param["n_values"]))

def teardown(self, bench_param):
# Exit runner context manager
Expand Down
24 changes: 16 additions & 8 deletions docs/examples/DataSet/Benchmarking.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,10 @@
],
"source": [
"%%time\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape):\n",
" for y in range(y_shape):\n",
" z = np.random.random_sample(1)"
" z = rng.random(1)"
]
},
{
Expand Down Expand Up @@ -202,11 +203,12 @@
],
"source": [
"%%time\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape):\n",
" for y in range(y_shape):\n",
" x_data[x, y] = x\n",
" y_data[x, y] = y\n",
" z_data[x, y] = np.random.random_sample()"
" z_data[x, y] = rng.random()"
]
},
{
Expand Down Expand Up @@ -257,9 +259,10 @@
],
"source": [
"%%time\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape // 10):\n",
" for y in range(y_shape):\n",
" double_dataset.add_results([{\"x\": x, \"y\": y, \"z\": np.random.random_sample()}])"
" double_dataset.add_results([{\"x\": x, \"y\": y, \"z\": rng.random()}])"
]
},
{
Expand Down Expand Up @@ -302,11 +305,12 @@
],
"source": [
"%%time\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape):\n",
" for y in range(y_shape):\n",
" x_data[y] = x\n",
" y_data[y] = y\n",
" z_data[y] = np.random.random_sample(1)[0]\n",
" z_data[y] = rng.random(1)[0]\n",
" single_dataset.add_results([{\"x\": x_data, \"y\": y_data, \"z\": z_data}])"
]
},
Expand Down Expand Up @@ -350,11 +354,12 @@
],
"source": [
"%%time\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape):\n",
" for y in range(y_shape):\n",
" x_data[x, y] = x\n",
" y_data[x, y] = y\n",
" z_data[x, y] = np.random.random_sample(1)[0]\n",
" z_data[x, y] = rng.random(1)[0]\n",
"zero_dataset.add_results([{\"x\": x_data, \"y\": y_data, \"z\": z_data}])"
]
},
Expand Down Expand Up @@ -395,10 +400,11 @@
],
"source": [
"%%timeit\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape):\n",
" x_data[x, :] = x\n",
" array1D_dataset.add_results(\n",
" [{\"x\": x_data[x, :], \"y\": y_setpoints, \"z\": np.random.random_sample(y_shape)}]\n",
" [{\"x\": x_data[x, :], \"y\": y_setpoints, \"z\": rng.random(y_shape)}]\n",
" )"
]
},
Expand Down Expand Up @@ -443,10 +449,11 @@
],
"source": [
"%%timeit\n",
"rng = np.random.default_rng()\n",
"for x in range(x_shape):\n",
" x_data[x, :] = x\n",
" y_data[x, :] = y_setpoints\n",
" z_data[x, :] = np.random.random_sample(y_shape)\n",
" z_data[x, :] = rng.random(y_shape)\n",
"array0D_dataset.add_results([{\"x\": x_data, \"y\": y_data, \"z\": z_data}])"
]
},
Expand All @@ -463,10 +470,11 @@
"metadata": {},
"outputs": [],
"source": [
"rng = np.random.default_rng()\n",
"data = []\n",
"for i in range(100):\n",
" for j in range(100):\n",
" data.append({\"x\": i, \"y\": j, \"z\": np.random.random_sample()})"
" data.append({\"x\": i, \"y\": j, \"z\": rng.random()})"
]
},
{
Expand Down
11 changes: 6 additions & 5 deletions docs/examples/DataSet/Dataset_Performance.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,16 @@
" meas.register_parameter(y1, setpoints=[x1, x2, x3], paramtype=paramtype)\n",
" meas.register_parameter(y2, setpoints=[x1, x2, x3], paramtype=paramtype)\n",
" start = time.perf_counter()\n",
" rng = np.random.default_rng()\n",
" with meas.run() as datasaver:\n",
" start_adding = time.perf_counter()\n",
" for i in range(nreps):\n",
" datasaver.add_result(\n",
" (x1, np.random.rand(npoints)),\n",
" (x2, np.random.rand(npoints)),\n",
" (x3, np.random.rand(npoints)),\n",
" (y1, np.random.rand(npoints)),\n",
" (y2, np.random.rand(npoints)),\n",
" (x1, rng.random(npoints)),\n",
" (x2, rng.random(npoints)),\n",
" (x3, rng.random(npoints)),\n",
" (y1, rng.random(npoints)),\n",
" (y2, rng.random(npoints)),\n",
" )\n",
" stop_adding = time.perf_counter()\n",
" run_id = datasaver.run_id\n",
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/DataSet/Extracting-runs-from-one-DB-file-to-another.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"\n",
"for run_id in range(1, 11):\n",
" with meas.run() as datasaver:\n",
" for step, noise in enumerate(np.random.randn(run_id)):\n",
" for step, noise in enumerate(np.random.default_rng().standard_normal(run_id)):\n",
" datasaver.add_result((my_inst.voltage, step), (my_inst.current, noise))"
]
},
Expand Down Expand Up @@ -339,7 +339,7 @@
"\n",
"for run_id in range(1, 11):\n",
" with meas.run() as datasaver:\n",
" for step, noise in enumerate(np.random.randn(run_id)):\n",
" for step, noise in enumerate(np.random.default_rng().standard_normal(run_id)):\n",
" datasaver.add_result((my_inst.current, step), (my_inst.voltage, noise))"
]
},
Expand Down
4 changes: 3 additions & 1 deletion docs/examples/DataSet/Linking to parent datasets.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@
"\n",
"with meas.run() as datasaver:\n",
" time_data = np.linspace(0, 1, N)\n",
" signal_data = np.sin(2 * np.pi * time_data) + 0.25 * np.random.randn(N)\n",
" signal_data = np.sin(\n",
" 2 * np.pi * time_data\n",
" ) + 0.25 * np.random.default_rng().standard_normal(N)\n",
"\n",
" datasaver.add_result((\"time\", time_data), (\"signal\", signal_data))\n",
"dataset = datasaver.dataset"
Expand Down
11 changes: 7 additions & 4 deletions docs/examples/DataSet/Offline Plotting Tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"meas = Measurement(exp=exp)\n",
"meas.register_parameter(x)\n",
"meas.register_parameter(y, setpoints=(x,))\n",
Expand All @@ -115,11 +116,11 @@
"# Randomly shuffle the values in order to test the plot\n",
"# that is to be created for this data is a correct line\n",
"# that does not depend on the order of the data.\n",
"np.random.shuffle(xvals)\n",
"rng.shuffle(xvals)\n",
"\n",
"with meas.run() as datasaver:\n",
" for xnum in xvals:\n",
" noise = np.random.randn() * 0.1 # multiplicative noise yeah yeah\n",
" noise = rng.standard_normal() * 0.1 # multiplicative noise yeah yeah\n",
" datasaver.add_result(\n",
" (x, xnum), (y, 2 * (xnum + noise) ** 3 - 5 * (xnum + noise) ** 2)\n",
" )\n",
Expand Down Expand Up @@ -210,13 +211,14 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"meas = Measurement(exp=exp)\n",
"meas.register_parameter(t)\n",
"meas.register_parameter(y, setpoints=(t,))\n",
"\n",
"with meas.run() as datasaver:\n",
" for tnum in np.linspace(-3.4, 4.2, 50):\n",
" noise = np.random.randn() * 0.1\n",
" noise = rng.standard_normal() * 0.1\n",
" datasaver.add_result(\n",
" (t, tnum * 1e-6),\n",
" (y, (2 * (tnum + noise) ** 3 - 5 * (tnum + noise) ** 2) * 1e3),\n",
Expand Down Expand Up @@ -772,6 +774,7 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"# First run\n",
"meas = Measurement(exp=exp)\n",
"meas.register_parameter(x)\n",
Expand All @@ -781,7 +784,7 @@
"\n",
"with meas.run() as datasaver:\n",
" for xnum in xvals:\n",
" noise = np.random.randn() * 0.1 # multiplicative noise yeah yeah\n",
" noise = rng.standard_normal() * 0.1 # multiplicative noise yeah yeah\n",
" datasaver.add_result(\n",
" (x, xnum), (y, 2 * (xnum + noise) ** 3 - 5 * (xnum + noise) ** 2)\n",
" )\n",
Expand Down
26 changes: 13 additions & 13 deletions docs/examples/DataSet/Offline plotting with categorical data.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"voltage = Parameter(\"voltage\", label=\"Voltage\", unit=\"V\", set_cmd=None, get_cmd=None)\n",
"fridge_config = Parameter(\n",
" \"config\", label=\"Fridge configuration\", set_cmd=None, get_cmd=None\n",
Expand All @@ -85,9 +86,7 @@
" configurations = [\"open\", \"outer chamber closed\", \"pumping\", \"closed\"]\n",
"\n",
" for configuration in configurations:\n",
" datasaver.add_result(\n",
" (fridge_config, configuration), (voltage, np.random.rand())\n",
" )\n",
" datasaver.add_result((fridge_config, configuration), (voltage, rng.random()))\n",
"\n",
"dataset = datasaver.dataset"
]
Expand Down Expand Up @@ -140,15 +139,14 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"with meas.run() as datasaver:\n",
" configurations = [\"open\", \"outer chamber closed\", \"pumping\", \"closed\"]\n",
"\n",
" for configuration in configurations:\n",
" datasaver.add_result(\n",
" (fridge_config, configuration), (voltage, np.random.rand())\n",
" )\n",
" datasaver.add_result((fridge_config, configuration), (voltage, rng.random()))\n",
"\n",
" datasaver.add_result((fridge_config, \"open\"), (voltage, np.random.rand()))\n",
" datasaver.add_result((fridge_config, \"open\"), (voltage, rng.random()))\n",
"\n",
"dataset = datasaver.dataset\n",
"\n",
Expand Down Expand Up @@ -182,6 +180,7 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"voltage = Parameter(\"voltage\", label=\"Voltage\", unit=\"V\", set_cmd=None, get_cmd=None)\n",
"response = Parameter(\"response\", label=\"Sample response\", set_cmd=None, get_cmd=None)\n",
"\n",
Expand All @@ -192,7 +191,7 @@
"\n",
"with meas.run() as datasaver:\n",
" for volt in np.linspace(0, 1, 50):\n",
" coinvalue = volt + 0.5 * np.random.randn()\n",
" coinvalue = volt + 0.5 * rng.standard_normal()\n",
" if coinvalue < 0:\n",
" resp = \"Bad\"\n",
" elif coinvalue < 0.8:\n",
Expand Down Expand Up @@ -252,6 +251,7 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"sample = Parameter(\"sample\", label=\"Sample\", unit=\"\", set_cmd=None, get_cmd=None)\n",
"feature = Parameter(\"feature\", label=\"Physical feature\", set_cmd=None, get_cmd=None)\n",
"\n",
Expand All @@ -264,10 +264,10 @@
" features = [\"superconducting\", \"qubit\", \"clean states\", \"high bandwidth\"]\n",
"\n",
" for samp in [\"Nanowire\", \"Silicon Chip\", \"SQUID\", \"Membrane\"]:\n",
" feats = np.random.randint(1, 5)\n",
" feats = rng.integers(1, 5)\n",
" for _ in range(feats):\n",
" datasaver.add_result(\n",
" (sample, samp), (feature, features[np.random.randint(0, 4)])\n",
" (sample, samp), (feature, features[rng.integers(0, 4)])\n",
" )\n",
"\n",
"dataset = datasaver.dataset"
Expand Down Expand Up @@ -602,8 +602,8 @@
"\n",
"\n",
"with meas.run() as datasaver:\n",
" for bias_v in 3 * (np.random.rand(100)):\n",
" for gate_v in 2 * (np.random.rand(75) - 0.5):\n",
" for bias_v in 3 * (np.random.default_rng().random(100)):\n",
" for gate_v in 2 * (np.random.default_rng().random(75) - 0.5):\n",
" datasaver.add_result(\n",
" (bias_voltage, bias_v),\n",
" (gate_voltage, gate_v),\n",
Expand Down Expand Up @@ -772,7 +772,7 @@
"\n",
"with meas.run() as datasaver:\n",
" for samp in samples:\n",
" for gate_v in 2 * (np.random.rand(75) - 0.5):\n",
" for gate_v in 2 * (np.random.default_rng().random(75) - 0.5):\n",
" datasaver.add_result(\n",
" (sample, samp),\n",
" (gate_voltage, gate_v),\n",
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/DataSet/Paramtypes explained.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
" )\n",
"\n",
" def get_raw(self):\n",
" return np.random.randn(self.N)\n",
" return np.random.default_rng().standard_normal(self.N)\n",
"\n",
"\n",
"class MultiDimSpectrum(ArrayParameter):\n",
Expand Down
6 changes: 4 additions & 2 deletions docs/examples/DataSet/Pedestrian example of subscribing to a DataSet.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"for x in np.linspace(100, 200, 150):\n",
" y = np.random.randn()\n",
" y = rng.standard_normal()\n",
" dataSet.add_results([{\"x\": x, \"y\": y}])"
]
},
Expand Down Expand Up @@ -349,8 +350,9 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"for x in np.linspace(0, 3 * np.pi, 100):\n",
" yvalue = 0.9 * np.sin(x) + np.random.randn() * 0.05\n",
" yvalue = 0.9 * np.sin(x) + rng.standard_normal() * 0.05\n",
" dataSet.add_results([{\"blip\": x, \"blop\": yvalue}])\n",
" sleep(0.1)"
]
Expand Down
10 changes: 6 additions & 4 deletions docs/examples/DataSet/Performing-measurements-using-qcodes-parameters-and-dataset.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2436,11 +2436,12 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"with meas.run() as datasaver:\n",
" t_start = monotonic()\n",
"\n",
" while monotonic() - t_start < 3:\n",
" set_v = 10 / 2 * (np.random.rand() + 1)\n",
" set_v = 10 / 2 * (rng.random() + 1)\n",
" dac.ch1.set(set_v)\n",
"\n",
" # some sleep to not get too many points (or to let the system settle)\n",
Expand Down Expand Up @@ -2719,6 +2720,7 @@
}
],
"source": [
"rng = np.random.default_rng()\n",
"meas2 = Measurement(exp=exp, name=\"random_sampling_measurement\")\n",
"meas2.register_parameter(dac.ch1)\n",
"meas2.register_parameter(dac.ch2)\n",
Expand All @@ -2730,8 +2732,8 @@
"\n",
"with meas2.run() as datasaver:\n",
" for i in range(npoints):\n",
" x = 2 * (np.random.rand() - 0.5)\n",
" y = 2 * (np.random.rand() - 0.5)\n",
" x = 2 * (rng.random() - 0.5)\n",
" y = 2 * (rng.random() - 0.5)\n",
" dac.ch1(x)\n",
" dac.ch2(y)\n",
" z = dmm.v2()\n",
Expand Down Expand Up @@ -3324,7 +3326,7 @@
"\n",
"\n",
"noise = 0.0005\n",
"x0 = [np.random.rand(), np.random.rand()]\n",
"x0 = [np.random.default_rng().random(), np.random.default_rng().random()]\n",
"\n",
"with meas.run() as datasaver:\n",
"\n",
Expand Down
Loading
Loading