dont forget to format.. (c14d3ca5) · Commits · DMT-development / DMT-core

DMT/core/dut_lib.py

+9 −3

Original line number	Diff line number	Diff line
		@@ -584,7 +584,9 @@ class DutLib(object):
		if json_content["__DutLib__"] == SEMVER_DUTLIB_CURRENT:
		pass
		elif json_content["__DutLib__"] == VersionInfo(major=1, minor=0):
		print("DMT:DutLib:load(): Loading an old lib. This will work, if the machine if the path stays the same. Otherwise, add 'save_dir' key to the dut_lib.json manually.")
		print(
		"DMT:DutLib:load(): Loading an old lib. This will work, if the machine if the path stays the same. Otherwise, add 'save_dir' key to the dut_lib.json manually."
		)
		else:
		raise IOError("DMT.DutLib: Tried to load a DutLib with unkown version.")

		@@ -667,13 +669,17 @@ class DutLib(object):
		dut_lib.dut_internal_dut_dir = Path(dut_lib.dut_internal_dut_dir)
		if not dut_lib.dut_internal_dut_dir.exists():
		dut_lib.dut_internal_dut_dir = Path(
		str(dut_lib.dut_internal_dut_dir).replace(save_dir_old, str(lib_directory), 1)
		str(dut_lib.dut_internal_dut_dir).replace(
		save_dir_old, str(lib_directory), 1
		)
		)
		if dut_lib.dut_intrinsic_dut_dir is not None:
		dut_lib.dut_intrinsic_dut_dir = Path(dut_lib.dut_intrinsic_dut_dir)
		if not dut_lib.dut_intrinsic_dut_dir.exists():
		dut_lib.dut_intrinsic_dut_dir = Path(
		str(dut_lib.dut_intrinsic_dut_dir).replace(save_dir_old, str(lib_directory), 1)
		str(dut_lib.dut_intrinsic_dut_dir).replace(
		save_dir_old, str(lib_directory), 1
		)
		)

		for dut in dut_lib.duts:

+9 −3

Original line number	Diff line number	Diff line
		@@ -131,7 +131,9 @@ class SimCon(object, metaclass=Singleton):
		{"dut": dut_a, "sweep": sweep_a} for dut_a, sweep_a in itertools.product(dut, sweep)
		]

		def run_and_read(self, force=False, remove_simulations=False, parallel_read=False, validate=True):
		def run_and_read(
		self, force=False, remove_simulations=False, parallel_read=False, validate=True
		):
		"""Run all queued simulations and load the results into the Duts' databases.

		Parameters
		@@ -195,7 +197,9 @@ class SimCon(object, metaclass=Singleton):
		if parallel_read:
		print("Checking which simulations need to be run in parallel:")
		sims_checked = parallel(
		delayed(_check_simulation_needed)(i_sim, n_tot, validate=validate, **sim)
		delayed(_check_simulation_needed)(
		i_sim, n_tot, validate=validate, **sim
		)
		for i_sim, sim in enumerate(self.sim_list)
		)
		else:
		@@ -240,7 +244,9 @@ class SimCon(object, metaclass=Singleton):
		print("Reading in the results:")
		# parallel not working with VAE modelcard currently since get_circuit is monkey patched
		sims_read = [
		_read_process_results(process["success"], process["dut"], process["sweep"], validate=validate)
		_read_process_results(
		process["success"], process["dut"], process["sweep"], validate=validate
		)
		for process in process_finished
		]
		all_sim_success = all(sim["success"] for sim in sims_read)

+1 −1

File changed.

Contains only whitespace changes.