Fix deprecation of numpy.float and numpy.int (#734)

* Try new numpy package

* Revert "Try new numpy package"

This reverts commit 630d437.

* Remove requirement on numpy in setup.py

* Bump numpy version in requirements/requirements_install.txt

* Update np.int with np.int32

* Update np.float references of dpf-core source code

* Update np.float references in tests

* Add --find-links to docs, examples, gate, post CI templates that it can install wheels from standalone branch

* Add gate in .github folder to test it

* Remove gate from .github

* Update unit test in test_geometry

* Update docker tests run with extra-pip-args

* Add dpf_wheels_directory to CI (tests, for retro)

* Add ansys-dpf-gate wheel

* update dtype in docstring

* to revert: test

* Update test

* Add check

* add test

* Add test

* Move check step

* Update dpf_wheels_directory

* add check

* update ci

* Move check

* Update docker step

* test adding ROOT_SPACE

* Update CI

* Try source dir

* remove failing check

* Removing failing on docstring (different on windows and on linux)

* Docker step updated

* Redo Docker_test

* Update test_geometry.py

* Fix expected raised error type in test_geometry.py

* Remove numpy pin in pyproject.toml

* Fix expected raised error type in test_geometry.py

* Remove test gate package since it has been released

---------

Co-authored-by: PProfizi <[email protected]>

Author: anslpa

.github/workflows/ci.yml

@@ -113,6 +113,7 @@ jobs:
       ANSYS_VERSION: "231"
       python_versions: '["3.8"]'
       DOCSTRING: false
+      custom-wheels: './.github'
     secrets: inherit
 
   retro_222:
@@ -123,6 +124,7 @@ jobs:
       ANSYS_VERSION: "222"
       python_versions: '["3.8"]'
       DOCSTRING: false
+      custom-wheels: './.github'
     secrets: inherit
 
   retro_221:
@@ -133,6 +135,7 @@ jobs:
       ANSYS_VERSION: "221"
       python_versions: '["3.8"]'
       DOCSTRING: false
+      custom-wheels: './.github'
     secrets: inherit
 
   pydpf-post:

.github/workflows/examples.yml

@@ -59,7 +59,6 @@ on:
 env:
   PACKAGE_NAME: ansys-dpf-core
   MODULE: core
-  extra: "--find-links .github/"
 
 jobs:
   setup:

.github/workflows/gate.yml

@@ -39,7 +39,6 @@ on:
 env:
   PACKAGE_NAME: ansys-dpf-core
   MODULE: core
-  extra: "--find-links .github/"
 
 jobs:
   setup:
@@ -88,7 +87,7 @@ jobs:
           install_extras: plotting
           wheelhouse: false
           wheel: false
-          extra-pip-args: ${{ env.extra }}
+          extra-pip-args: ${{ format('--find-links ./dpf-standalone/v{0}/dist', inputs.ANSYS_VERSION) }}
           standalone_suffix: ${{ inputs.standalone_suffix }}
           custom-requirements: ${{ inputs.custom-requirements }}
 

pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "packaging",
     "setuptools",
     "tqdm",
-    "numpy<1.24",
+    "numpy",
     "ansys-dpf-gate>=0.3.*",
 ]
 

requirements/requirements_install.txt

@@ -1,5 +1,5 @@
 ansys-dpf-gate==0.3.0
-numpy==1.23.4
+numpy==1.24.1
 packaging==23.0
 psutil==5.9.4
 tqdm==4.64.1

src/ansys/dpf/core/collection.py

@@ -105,7 +105,7 @@ def integral_collection(inpt, server: BaseServer = None):
             inpt = inpt.flatten()
         if all(isinstance(x, (int, np.int32)) for x in inpt):
             return IntCollection(inpt, server=server)
-        if all(isinstance(x, (float, np.float)) for x in inpt):
+        if all(isinstance(x, (float, np.float64)) for x in inpt):
             return FloatCollection(inpt, server=server)
         else:
             raise NotImplementedError(
@@ -556,7 +556,7 @@ def create_subtype(self, obj_by_copy):
         return float(obj_by_copy)
 
     def _set_integral_entries(self, input):
-        dtype = np.float
+        dtype = np.float64
         if isinstance(input, range):
             input = np.array(list(input), dtype=dtype)
         elif not isinstance(input, (np.ndarray, np.generic)):

src/ansys/dpf/core/elements.py

@@ -656,15 +656,13 @@ def map_scoping(self, external_scope):
         >>> vol = model.results.elemental_volume()
         >>> field = vol.outputs.fields_container()[0]
         >>> ind, mask = elements.map_scoping(field.scoping)
-        >>> ind
-        array([0, 1, 2, 3, 4, 5, 6, 7])
 
         """
         if external_scope.location in ["Nodal", "NodalElemental"]:
             raise ValueError('Input scope location must be "Nodal"')
         arr = np.array(list(map(self.mapping_id_to_index.get, external_scope.ids)))
         mask = arr != None
-        ind = arr[mask].astype(np.int)
+        ind = arr[mask].astype(np.int32)
         return ind, mask
 
     @property

src/ansys/dpf/core/nodes.py

@@ -322,7 +322,7 @@ def map_scoping(self, external_scope):
             raise ValueError('Input scope location must be "Nodal"')
         arr = np.array(list(map(self.mapping_id_to_index.get, external_scope.ids)))
         mask = arr != None
-        ind = arr[mask].astype(np.int)
+        ind = arr[mask].astype(np.int32)
         return ind, mask
 
     def add_node(self, id, coordinates):

tests/test_custom_type_field.py

@@ -54,14 +54,14 @@ def test_create_custom_type_field_push_back(server_type):
 
 @conftest.raises_for_servers_version_under("5.0")
 def test_set_get_data_pointer_custom_type_field(server_type):
-    field = dpf.core.CustomTypeField(np.float, nentities=20, server=server_type)
+    field = dpf.core.CustomTypeField(np.float64, nentities=20, server=server_type)
     field_def = dpf.core.FieldDefinition(server=server_type)
     field_def.dimensionality = dpf.core.Dimensionality({3}, dpf.core.natures.vector)
     field.field_definition = field_def
     scop = dpf.core.Scoping(ids=[1, 2, 3, 4], location="faces", server=server_type)
     field.scoping = scop
 
-    data = np.empty((24,), dtype=np.float)
+    data = np.empty((24,), dtype=np.float64)
     for i in range(0, 24):
         data[i] = i
     field.data = data
@@ -85,7 +85,7 @@ def test_set_get_data_pointer_custom_type_field(server_type):
 
 @conftest.raises_for_servers_version_under("5.0")
 def test_set_get_field_def_custom_type_field(server_type):
-    field = dpf.core.CustomTypeField(np.float, nentities=20, server=server_type)
+    field = dpf.core.CustomTypeField(np.float64, nentities=20, server=server_type)
     field_def = dpf.core.FieldDefinition(server=server_type)
     field_def.dimensionality = dpf.core.Dimensionality([3], dpf.core.natures.vector)
     field_def.location = core.locations.elemental
@@ -116,14 +116,14 @@ def test_set_get_field_def_custom_type_field(server_type):
 
 @conftest.raises_for_servers_version_under("5.0")
 def test_mutable_data_custom_type_field(server_clayer):
-    field = dpf.core.CustomTypeField(np.float, nentities=20, server=server_clayer)
+    field = dpf.core.CustomTypeField(np.float64, nentities=20, server=server_clayer)
     field_def = dpf.core.FieldDefinition(server=server_clayer)
     field_def.dimensionality = dpf.core.Dimensionality({3}, dpf.core.natures.vector)
     field.field_definition = field_def
     scop = dpf.core.Scoping(ids=[1, 2, 3, 4], location="faces", server=server_clayer)
     field.scoping = scop
 
-    data = np.empty((24,), dtype=np.float)
+    data = np.empty((24,), dtype=np.float64)
     for i in range(0, 24):
         data[i] = i
     field.data = data
@@ -153,14 +153,14 @@ def test_mutable_data_custom_type_field(server_clayer):
 
 @conftest.raises_for_servers_version_under("5.0")
 def test_mutable_data_contiguous_custom_type_field(server_clayer):
-    field = dpf.core.CustomTypeField(np.float, nentities=20, server=server_clayer)
+    field = dpf.core.CustomTypeField(np.float64, nentities=20, server=server_clayer)
     field_def = dpf.core.FieldDefinition(server=server_clayer)
     field_def.dimensionality = dpf.core.Dimensionality([6], dpf.core.natures.vector)
     field.field_definition = field_def
     scop = dpf.core.Scoping(ids=[1, 2, 3, 4], location="faces", server=server_clayer)
     field.scoping = scop
 
-    data = np.empty((24,), dtype=np.float)
+    data = np.empty((24,), dtype=np.float64)
     for i in range(0, 24):
         data[i] = i
     field.data = data
@@ -189,15 +189,14 @@ def test_mutable_data_contiguous_custom_type_field(server_clayer):
 
 # not using a fixture on purpose: the instance of simple field SHOULD be owned by each test
 def get_float_field(server_clayer):
-    field = dpf.core.CustomTypeField(np.float32, nentities=20, server=server_clayer)
-    field = dpf.core.CustomTypeField(np.float, nentities=20, server=server_clayer)
+    field = dpf.core.CustomTypeField(np.float64, nentities=20, server=server_clayer)
     field_def = dpf.core.FieldDefinition(server=server_clayer)
     field_def.dimensionality = dpf.core.Dimensionality({3}, dpf.core.natures.vector)
     field.field_definition = field_def
     scop = dpf.core.Scoping(ids=[1, 2, 3, 4], location="faces", server=server_clayer)
     field.scoping = scop
 
-    data = np.empty((24,), dtype=np.float)
+    data = np.empty((24,), dtype=np.float64)
     for i in range(0, 24):
         data[i] = i
     field.data = data

tests/test_field.py

@@ -25,7 +25,7 @@ def test_create_field(server_type):
 
 def test_empty_field(server_type):
     field = dpf.core.Field(server=server_type)
-    assert np.allclose(field.data, np.empty((0,), dtype=np.float))
+    assert np.allclose(field.data, np.empty((0,), dtype=np.float64))
     field = dpf.core.PropertyField(server=server_type)
     assert np.allclose(field.data, np.empty((0,), dtype=np.int32))
 
@@ -925,7 +925,7 @@ def get_simple_field(server_clayer):
     scop = dpf.core.Scoping(ids=[1, 2, 3, 4], location="faces", server=server_clayer)
     field.scoping = scop
 
-    data = np.empty((24,), dtype=np.float)
+    data = np.empty((24,), dtype=np.float64)
     for i in range(0, 24):
         data[i] = i
     field.data = data
@@ -995,7 +995,7 @@ def test_mutable_entity_data_contiguous_field(server_clayer):
     scop = dpf.core.Scoping(ids=[1, 2, 3, 4], location="faces", server=server_clayer)
     field.scoping = scop
 
-    data = np.empty((24,), dtype=np.float)
+    data = np.empty((24,), dtype=np.float64)
     for i in range(0, 24):
         data[i] = i
     field.data = data