Skip to content

Support new numpy #1215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfeurer merged 2 commits into from
Feb 23, 2023
Merged

Support new numpy #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
046869e
Drop upper bound on numpy version
mfeurer Feb 22, 2023
25c5ad9
Update changelog
mfeurer Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/progress.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Changelog
0.13.1
~~~~~~

* Add new contributions here.
* FIX #1198: Support numpy 1.24 and higher.


0.13.0
Expand Down
12 changes: 8 additions & 4 deletions openml/extensions/sklearn/extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,14 +1252,16 @@ def _check_dependencies(self, dependencies: str, strict_version: bool = True) ->
def _serialize_type(self, o: Any) -> "OrderedDict[str, str]":
mapping = {
float: "float",
np.float: "np.float", # type: ignore
np.float32: "np.float32",
np.float64: "np.float64",
int: "int",
np.int: "np.int", # type: ignore
np.int32: "np.int32",
np.int64: "np.int64",
}
if LooseVersion(np.__version__) < "1.24":
mapping[np.float] = "np.float"
mapping[np.int] = "np.int"

ret = OrderedDict() # type: 'OrderedDict[str, str]'
ret["oml-python:serialized_object"] = "type"
ret["value"] = mapping[o]
Expand All @@ -1268,14 +1270,16 @@ def _serialize_type(self, o: Any) -> "OrderedDict[str, str]":
def _deserialize_type(self, o: str) -> Any:
mapping = {
"float": float,
"np.float": np.float, # type: ignore
"np.float32": np.float32,
"np.float64": np.float64,
"int": int,
"np.int": np.int, # type: ignore
"np.int32": np.int32,
"np.int64": np.int64,
}
if LooseVersion(np.__version__) < "1.24":
mapping["np.float"] = np.float
mapping["np.int"] = np.int

return mapping[o]

def _serialize_rv_frozen(self, o: Any) -> "OrderedDict[str, Union[str, Dict]]":
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"python-dateutil", # Installed through pandas anyway.
"pandas>=1.0.0",
"scipy>=0.13.3",
"numpy>=1.6.2,<1.24",
"numpy>=1.6.2",
"minio",
"pyarrow",
],
Expand Down
5 changes: 4 additions & 1 deletion tests/test_extensions/test_sklearn_extension/test_sklearn_extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,10 @@ def test_serialize_strings_as_pipeline_steps(self):
self.assertEqual(extracted_info[2]["drop"].name, "drop")

def test_serialize_type(self):
supported_types = [float, np.float, np.float32, np.float64, int, np.int, np.int32, np.int64]
supported_types = [float, np.float32, np.float64, int, np.int32, np.int64]
if LooseVersion(np.__version__) < "1.24":
supported_types.append(np.float)
supported_types.append(np.int)

for supported_type in supported_types:
serialized = self.extension.model_to_flow(supported_type)
Expand Down