From 0488e4cccb18f74d3a8c24ec6a85328df3e4ab30 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Fri, 26 Jul 2024 12:44:11 +0500 Subject: [PATCH] bcfp numpy 2.0+ support #5080 `np.float_` is deprecated, it was just an alias for `np.float64` --- src/bcf/bcf/geometry.py | 10 +++++----- src/bcf/bcf/v2/topic.py | 2 +- src/bcf/bcf/v2/visinfo.py | 8 ++++---- src/bcf/bcf/v3/topic.py | 2 +- src/bcf/bcf/v3/visinfo.py | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bcf/bcf/geometry.py b/src/bcf/bcf/geometry.py index 92759f9b99..c32ae7619a 100644 --- a/src/bcf/bcf/geometry.py +++ b/src/bcf/bcf/geometry.py @@ -5,8 +5,8 @@ from numpy.typing import NDArray def camera_vectors_from_element_placement( - elem_placement: NDArray[np.float_], -) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]: + elem_placement: NDArray[np.float64], +) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]: """ Calculate the vectors of a camera pointing to an element. @@ -21,8 +21,8 @@ def camera_vectors_from_element_placement( def camera_vectors_from_target_position( - target_position: NDArray[np.float_], offset: Optional[NDArray[np.float_]] = None -) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]: + target_position: NDArray[np.float64], offset: Optional[NDArray[np.float64]] = None +) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]: """ Calculate the vectors of a camera pointing to a target point. @@ -50,7 +50,7 @@ def camera_vectors_from_target_position( # return camera_position, -mat[:3, 2], mat[:3, 1] -def unit_vector(v: NDArray[np.float_]) -> NDArray[np.float_]: +def unit_vector(v: NDArray[np.float64]) -> NDArray[np.float64]: """ Return the unit vector of a vector. diff --git a/src/bcf/bcf/v2/topic.py b/src/bcf/bcf/v2/topic.py index c23e240700..82f09c54a4 100644 --- a/src/bcf/bcf/v2/topic.py +++ b/src/bcf/bcf/v2/topic.py @@ -278,7 +278,7 @@ class TopicHandler: self.add_visinfo_handler(new_viewpoint) return new_viewpoint - def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None: + def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None: """Add a viewpoint pointing at an XYZ point in space Args: diff --git a/src/bcf/bcf/v2/visinfo.py b/src/bcf/bcf/v2/visinfo.py index 7ac1a750d8..08694b8111 100644 --- a/src/bcf/bcf/v2/visinfo.py +++ b/src/bcf/bcf/v2/visinfo.py @@ -176,7 +176,7 @@ class VisualizationInfoHandler: @classmethod def create_from_point_and_guids( cls, - position: NDArray[np.float_], + position: NDArray[np.float64], *guids: str, xml_handler: Optional[AbstractXmlParserSerializer] = None, ) -> "VisualizationInfoHandler": @@ -224,7 +224,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo: ) -def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo: +def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo: """ Return a BCF viewpoint of an IFC element. @@ -261,7 +261,7 @@ def build_components(*guids: str) -> mdl.Components: ) -def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera: +def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera: """ Return a BCF camera for an IFC element placement matrix. @@ -275,7 +275,7 @@ def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera: def build_camera_from_vectors( - camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_] + camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64] ) -> mdl.PerspectiveCamera: """ Return a BCF camera for an IFC element placement matrix. diff --git a/src/bcf/bcf/v3/topic.py b/src/bcf/bcf/v3/topic.py index 927d1e0d74..44109a21db 100644 --- a/src/bcf/bcf/v3/topic.py +++ b/src/bcf/bcf/v3/topic.py @@ -175,7 +175,7 @@ class TopicHandler: new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler) self.add_visinfo_handler(new_viewpoint) - def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None: + def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float64], *guids: str) -> None: """ Add a viewpoint tergeting an IFC element to the topic. diff --git a/src/bcf/bcf/v3/visinfo.py b/src/bcf/bcf/v3/visinfo.py index 56c1692206..f2666288d9 100644 --- a/src/bcf/bcf/v3/visinfo.py +++ b/src/bcf/bcf/v3/visinfo.py @@ -175,7 +175,7 @@ class VisualizationInfoHandler: @classmethod def create_from_point_and_guids( cls, - position: NDArray[np.float_], + position: NDArray[np.float64], *guids: str, xml_handler: Optional[AbstractXmlParserSerializer] = None, ) -> "VisualizationInfoHandler": @@ -218,7 +218,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo: ) -def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo: +def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo: """ Return a BCF viewpoint of an IFC element. @@ -255,7 +255,7 @@ def build_components(*guids: str) -> mdl.Components: ) -def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera: +def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera: """ Return a BCF camera for an IFC element placement matrix. @@ -269,7 +269,7 @@ def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera: def build_camera_from_vectors( - camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_] + camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64] ) -> mdl.PerspectiveCamera: """ Return a BCF camera for an IFC element placement matrix.