88 numpy20 compatibility (#90)

* Add numpy2.0 compatibility

* bump version

* Add qhack talk to the readme

Author: S-Linde

README.md

@@ -11,6 +11,9 @@ Please feel free to contact us via <s.feld@tudelft.nl> if you have any questions
 What follows are some simple steps to get you running.
 You could also have a look at some [Jupyter Notebooks](https://github.com/QuTech-Delft/qgym/tree/master/notebooks) that we have created for a tutorial at the [IEEE International Conference on Quantum Computing and Engineering (QCE’22)](https://qce.quantum.ieee.org/2022/tutorials-program/).
 
+We also gave an talk about the package at qhack 2024, which you can find by clicking the image below.
+[![qgym: A Gym for RL-based Quantum Compilation](https://img.youtube.com/vi/4copOSHxwSA/0.jpg)](https://www.youtube.com/watch?v=4copOSHxwSA "qgym: A Gym for RL-based Quantum Compilation")
+
 ### Installing with pip
 To install the `qgym` use
 ```terminal
@@ -22,7 +25,7 @@ In this case, use
 pip install qgym[tutorial]
 ```
 
-Currently `qgym` has support for Python 3.7, 3.8, 3.9, 3.10 and 3.11.
+Currently `qgym` has support for Python 3.8, 3.9, 3.10, 3.11 and 3.12.
 
 
 ## Publication

qgym/__init__.py

@@ -25,4 +25,4 @@
 
 """
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

qgym/envs/initial_mapping/initial_mapping_state.py

@@ -66,7 +66,7 @@ def __init__(
 
         connection = {
             "graph": deepcopy(connection_graph),
-            "matrix": nx.to_numpy_array(connection_graph, dtype=np.float_),
+            "matrix": nx.to_numpy_array(connection_graph, dtype=np.float64),
         }
 
         self.graphs = {

qgym/envs/initial_mapping/initial_mapping_visualiser.py

@@ -137,7 +137,7 @@ def render(self, state: InitialMappingState) -> None | NDArray[np.int_]:
         return self._display()
 
     def _get_mapped_graph(
-        self, mapping: dict[int, int], interaction_graph_matrix: NDArray[np.float_]
+        self, mapping: dict[int, int], interaction_graph_matrix: NDArray[np.float64]
     ) -> nx.Graph:
         """Construct a mapped graph.
 
@@ -177,7 +177,7 @@ def _get_mapped_graph(
     def _add_colored_edge(
         self,
         graph: nx.Graph,
-        mapped_adjacency_matrix: NDArray[np.float_],
+        mapped_adjacency_matrix: NDArray[np.float64],
         edge: tuple[int, int],
     ) -> None:
         """Give an edge of the graph a color based on the mapping.
@@ -253,10 +253,12 @@ def _draw_mapped_graph(self, screen: Surface, mapped_graph: nx.Graph) -> None:
             pos_v = self.graphs["mapped"]["render_positions"][v]
             if mapped_graph.edges[u, v]["color"] == "red":
                 color = self.colors["missing_edge"]
-            if mapped_graph.edges[u, v]["color"] == "green":
+            elif mapped_graph.edges[u, v]["color"] == "green":
                 color = self.colors["used_edge"]
-            if mapped_graph.edges[u, v]["color"] == "gray":
+            elif mapped_graph.edges[u, v]["color"] == "gray":
                 color = self.colors["unused_edge"]
+            else:
+                raise ValueError("Unknow color")
             draw_wide_line(screen, color, pos_u, pos_v)
 
         for pos in self.graphs["mapped"]["render_positions"].values():
@@ -278,7 +280,7 @@ def _draw_header(self, text: str, subscreen: pygame.Rect, screen: Surface) -> No
     @staticmethod
     def _get_render_positions(
         graph: nx.Graph, subscreen: pygame.Rect
-    ) -> dict[Any, NDArray[np.float_]]:
+    ) -> dict[Any, NDArray[np.float64]]:
         """Give the positions of the nodes of a graph on a given subscreen.
 
         Args:
@@ -289,7 +291,7 @@ def _get_render_positions(
             A dictionary where the keys are the names of the nodes, and the values are
             the coordinates of these nodes.
         """
-        node_positions: dict[Any, NDArray[np.float_]]
+        node_positions: dict[Any, NDArray[np.float64]]
         node_positions = nx.spring_layout(graph, threshold=1e-6)
 
         # Scale and move the node positions to be centered on the subscreen

qgym/envs/routing/routing_state.py

@@ -103,7 +103,7 @@ def __init__(  # pylint: disable=too-many-arguments
         if observe_connection_graph:
             if has_fidelity(connection_graph):
                 self.connection_matrix = nx.to_numpy_array(
-                    connection_graph, dtype=np.float_
+                    connection_graph, dtype=np.float64
                 ).flatten()
             else:
                 self.connection_matrix = nx.to_numpy_array(

qgym/envs/routing/routing_visualiser.py

@@ -146,7 +146,7 @@ def _draw_circuit_lines(  # pylint: disable=too-many-arguments
         x_text: float,
         x_left: float,
         x_right: float,
-        y_lines: NDArray[np.float_],
+        y_lines: NDArray[np.float64],
     ) -> None:
         """Draw the circuit lines on the 'circuit' screen and label them.
 
@@ -177,8 +177,8 @@ def _draw_interaction_gates(
         screen: Surface,
         *,
         state: RoutingState,
-        x_gates: NDArray[np.float_],
-        y_lines: NDArray[np.float_],
+        x_gates: NDArray[np.float64],
+        y_lines: NDArray[np.float64],
     ) -> None:
         """Draw the interaction gates on the 'circuit' screen.
 
@@ -245,8 +245,8 @@ def _draw_mapping(
         screen: Surface,
         *,
         state: RoutingState,
-        x_gates: NDArray[np.float_],
-        y_lines: NDArray[np.float_],
+        x_gates: NDArray[np.float64],
+        y_lines: NDArray[np.float64],
     ) -> None:
         """Draw the mapping on the 'circuit' screen.
 
@@ -357,7 +357,7 @@ def _draw_header(self, text: str, screen: Surface) -> None:
 
     def _get_render_positions(
         self, graph: nx.Graph, padding: int = 20
-    ) -> dict[Any, NDArray[np.float_]]:
+    ) -> dict[Any, NDArray[np.float64]]:
         """Give the positions of the nodes of a graph on a given screen.
 
         Args:
@@ -368,7 +368,7 @@ def _get_render_positions(
             Dictionary where the keys are the names of the nodes, and the values are the
             coordinates of these nodes.
         """
-        node_positions: dict[Any, NDArray[np.float_]]
+        node_positions: dict[Any, NDArray[np.float64]]
         node_positions = nx.spring_layout(graph, threshold=1e-6)
 
         # Scale and move the node positions to be centered on the graph subscreen

qgym/spaces/box.py

@@ -32,7 +32,7 @@ def __init__(  # pylint: disable=too-many-arguments
         low: SupportsFloat | ArrayLike,
         high: SupportsFloat | ArrayLike,
         shape: Sequence[int] | None = None,
-        dtype: type[np.floating[Any]] | type[np.integer[Any]] = np.float_,
+        dtype: type[np.floating[Any]] | type[np.integer[Any]] = np.float64,
         *,
         rng: Generator | None = None,
     ) -> None:

tests/envs/initial_mapping/test_initial_mapping_rewarders.py

@@ -216,7 +216,7 @@ def test_episode_rewarder(
 """
 
 fidelity_graph = np.array(
-    ([[0, 0.2, 0.6], [0.2, 0, 0.74], [0.6, 0.74, 0]]), dtype=np.float_
+    ([[0, 0.2, 0.6], [0.2, 0, 0.74], [0.6, 0.74, 0]]), dtype=np.float64
 )