Skip to content

Commit 69594fa

Browse files
committed
Write machine size to database
1 parent 092d95a commit 69594fa

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

spinn_front_end_common/interface/ds/ds_sqllite_database.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -704,15 +704,16 @@ def write_session_credentials_to_db(self) -> None:
704704
VALUES(?, ?, ?)
705705
""", [(k1, k2, v) for (k1, k2), v in config.items()])
706706

707-
def set_app_id(self) -> None:
707+
def set_info(self) -> None:
708708
"""
709-
Sets the app id
709+
Sets the general information
710710
"""
711711
# check for previous content
712+
machine = FecDataView().get_machine()
712713
self.cursor().execute(
713714
"""
714-
INSERT INTO app_id(app_id)
715-
VALUES(?)
716-
""", (FecDataView.get_app_id(), ))
715+
INSERT INTO info(app_id, width, height)
716+
VALUES(?, ?, ?)
717+
""", (FecDataView.get_app_id(), machine.width, machine.height))
717718
if self.rowcount == 0:
718-
raise DsDatabaseException("Unable to set app id")
719+
raise DsDatabaseException("Unable to set info")

spinn_front_end_common/interface/ds/dse.sql

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,19 @@ ON reference.reference_num = region.reference_num
135135

136136
CREATE VIEW IF NOT EXISTS pointer_content_view AS
137137
SELECT x, y, p, region_num, pointer, content FROM
138-
(SELECT reference.x, reference.y, reference.p, reference.region_num, pointer, NULL as content
139-
FROM reference LEFT JOIN region
140-
ON reference.reference_num = region.reference_num
141-
AND reference.x = region.x
142-
AND reference.y = region.y)
138+
(SELECT reference.x, reference.y, reference.p, reference.region_num, pointer, NULL as content
139+
FROM reference LEFT JOIN region
140+
ON reference.reference_num = region.reference_num
141+
AND reference.x = region.x
142+
AND reference.y = region.y)
143143
UNION
144144
SELECT x, y, p, region_num, pointer, content FROM region;
145145

146-
CREATE TABLE IF NOT EXISTS app_id (
147-
app_id INTEGER NOT NULL
146+
-- Information about more general overall things
147+
CREATE TABLE IF NOT EXISTS info (
148+
app_id INTEGER NOT NULL,
149+
width INTEGER NOT NULL,
150+
height INTEGER NOT NULL
148151
);
149152

150153
-- Information about how to access the connection proxying

spinn_front_end_common/interface/interface_functions/graph_data_specification_writer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def run(self,
8282
f"ds{FecDataView.get_reset_str()}.sqlite3")
8383
with DsSqlliteDatabase(path) as ds_db:
8484
ds_db.write_session_credentials_to_db()
85-
ds_db. set_app_id()
85+
ds_db.set_info()
8686

8787
placements: Iterable[Placement]
8888
if placement_order is None:

0 commit comments

Comments
 (0)