Skip to content

Commit a6e6339

Browse files
authored
update python h5py to fix build break caused by recent to HDF5 update (#9223)
1 parent 1dbde42 commit a6e6339

6 files changed

Lines changed: 25 additions & 36 deletions

File tree

SPECS/keras/keras.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Keras is a high-level neural networks API.
44
Name: keras
55
Version: 2.11.0
6-
Release: 2%{?dist}
6+
Release: 3%{?dist}
77
License: ASL 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -25,6 +25,7 @@ BuildRequires: python3-wheel
2525
BuildRequires: tar
2626
BuildRequires: which
2727
BuildRequires: python3-tf-nightly = 2.11.0
28+
BuildRequires: python3-h5py
2829
ExclusiveArch: x86_64
2930

3031
%description
@@ -69,6 +70,9 @@ bazel --batch build --verbose_explanations //keras/tools/pip_package:build_pip_
6970

7071

7172
%changelog
73+
* Fri May 24 2024 Riken Maharjan <rmaharjan@microsoft.com> - 2.11.0-3
74+
- Explicitly BR python3-h5py.
75+
7276
* Tue Aug 01 2023 Riken Maharjan <rmaharjan@microsoft.com> - 2.11.0-2
7377
- Remove bazel version.
7478

SPECS/python-h5py/h5py-3.7.0-ppc-float128.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"h5py-3.7.0.tar.gz": "3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3"
3+
"h5py-3.10.0.tar.gz": "d93adc48ceeb33347eb24a634fb787efc7ae4644e6ea4ba733d099605045c049"
44
}
5-
}
5+
}

SPECS/python-h5py/python-h5py.spec

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ data types and data structures and their HDF5 equivalents vastly\
1212
simplifies the process of reading and writing data from Python.
1313
Summary: A Python interface to the HDF5 library
1414
Name: h5py
15-
Version: 3.7.0
16-
Release: 5%{?dist}
15+
Version: 3.10.0
16+
Release: 1%{?dist}
1717
License: BSD
1818
Vendor: Microsoft Corporation
1919
Distribution: Mariner
2020
URL: https://www.h5py.org/
2121
Source0: https://files.pythonhosted.org/packages/source/h/h5py/h5py-%{version}.tar.gz
22-
# drop the unnecessary workaround for float128 type after
23-
# https://fedoraproject.org/wiki/Changes/PPC64LE_Float128_Transition
24-
# in F-36
25-
Patch0: h5py-3.7.0-ppc-float128.patch
22+
2623
BuildRequires: gcc
2724
BuildRequires: hdf5-devel >= 1.14.4
2825
BuildRequires: liblzf-devel
@@ -50,7 +47,7 @@ Requires: python%{python3_pkgversion}-six
5047

5148
%prep
5249
%setup -q -c -n %{name}-%{version}
53-
%patch0
50+
5451
mv %{name}-%{version} serial
5552
cd serial
5653
%{__python3} api_gen.py
@@ -69,7 +66,11 @@ export H5PY_SYSTEM_LZF=1
6966
export CFLAGS="%{optflags} -fopenmp"
7067
cd serial
7168
%py3_build
69+
cd -
7270

71+
# MPI
72+
export CC=mpicc
73+
export HDF5_MPI="ON"
7374

7475
%install
7576
# Upstream requires a specific numpy without this
@@ -92,6 +93,9 @@ cd -
9293
%{python3_sitearch}/%{name}-%{version}-*.egg-info
9394

9495
%changelog
96+
* Thu May 23 2024 Riken Maharjan <rmaharjan@microsoft.com> - 3.10.0-1
97+
- Update to 3.10.0 to match hdf5 1.14.4
98+
9599
* Mon May 20 2024 George Mileka <gmileka@microsoft.com> - 3.7.0-5
96100
- Bumping the release version so that this package is re-built with the newer
97101
1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will

SPECS/python-tensorflow-estimator/python-tensorflow-estimator.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A high-level TensorFlow API that greatly simplifies machine learning programming
77
Summary: A high-level TensorFlow API that greatly simplifies machine learning programming
88
Name: python-%{pypi_name}
99
Version: 2.11.0
10-
Release: 1%{?dist}
10+
Release: 2%{?dist}
1111
License: ASL 2.0
1212
Vendor: Microsoft Corporation
1313
Distribution: Mariner
@@ -21,6 +21,7 @@ BuildRequires: python3-wheel
2121
BuildRequires: python3-six
2222
BuildRequires: python3-tf-nightly
2323
BuildRequires: python3-keras
24+
BuildRequires: python3-h5py
2425
ExclusiveArch: x86_64
2526

2627

@@ -61,6 +62,9 @@ bazel --batch build //tensorflow_estimator/tools/pip_package:build_pip_package
6162
%{python3_sitelib}/*
6263

6364
%changelog
65+
* Fri May 24 2024 Riken Maharjan <rmaharjan@microsoft.com> - 2.11.0-2
66+
- Explicitly BR python3-h5py.
67+
6468
* Fri Nov 11 2022 Riken Maharjan <rmaharjan@microsoft.com> - 2.11.0-1
6569
- Original version for CBL-Mariner. License Verified.
6670

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5130,8 +5130,8 @@
51305130
"type": "other",
51315131
"other": {
51325132
"name": "h5py",
5133-
"version": "3.7.0",
5134-
"downloadUrl": "https://files.pythonhosted.org/packages/source/h/h5py/h5py-3.7.0.tar.gz"
5133+
"version": "3.10.0",
5134+
"downloadUrl": "https://files.pythonhosted.org/packages/source/h/h5py/h5py-3.10.0.tar.gz"
51355135
}
51365136
}
51375137
},

0 commit comments

Comments
 (0)