From 90ffa080f1efbc23c14844de011b6f3472a6a7c2 Mon Sep 17 00:00:00 2001
From: Simon Humpohl <simon.humpohl@rwth-aachen.de>
Date: Sun, 6 Jun 2021 15:07:56 +0200
Subject: [PATCH] Fix numpy table entry dtype on 64bit linux systems
---
tabor_control/__init__.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tabor_control/__init__.py b/tabor_control/__init__.py
index 88dd669..d0b0c01 100644
--- a/tabor_control/__init__.py
+++ b/tabor_control/__init__.py
@@ -36,8 +36,9 @@ __version__ = "0.1"
TABLE_ENTRY_FORMAT = struct.Struct('< L H B x')
-TABLE_ENTRY_DTYPE = np.dtype([('repeats', 'L'), ('segment_no', 'H'), ('jump_flag', 'B')], align=True)
-assert TABLE_ENTRY_FORMAT.size == TABLE_ENTRY_DTYPE.itemsize
+TABLE_ENTRY_DTYPE = np.dtype([('repeats', '<u4'), ('segment_no', '<u2'), ('jump_flag', '|u1')], align=True)
+assert TABLE_ENTRY_FORMAT.size == TABLE_ENTRY_DTYPE.itemsize == 8
+assert [TABLE_ENTRY_FORMAT.unpack(bytes(range(1, 9)))] == np.frombuffer(bytes(range(1, 9)), dtype=TABLE_ENTRY_DTYPE).tolist()
class ParanoiaLevel(enum.Enum):
--
GitLab