diff --git a/SPECS/keras/keras.spec b/SPECS/keras/keras.spec index 328383831f..7aa2d3603e 100644 --- a/SPECS/keras/keras.spec +++ b/SPECS/keras/keras.spec @@ -3,7 +3,7 @@ Summary: Keras is a high-level neural networks API. Name: keras Version: 2.11.0 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -25,6 +25,7 @@ BuildRequires: python3-wheel BuildRequires: tar BuildRequires: which BuildRequires: python3-tf-nightly = 2.11.0 +BuildRequires: python3-h5py ExclusiveArch: x86_64 %description @@ -69,6 +70,9 @@ bazel --batch build --verbose_explanations //keras/tools/pip_package:build_pip_ %changelog +* Fri May 24 2024 Riken Maharjan - 2.11.0-3 +- Explicitly BR python3-h5py. + * Tue Aug 01 2023 Riken Maharjan - 2.11.0-2 - Remove bazel version. diff --git a/SPECS/python-h5py/h5py-3.7.0-ppc-float128.patch b/SPECS/python-h5py/h5py-3.7.0-ppc-float128.patch deleted file mode 100644 index 71dbd80a87..0000000000 --- a/SPECS/python-h5py/h5py-3.7.0-ppc-float128.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up h5py-3.7.0/h5py/h5t.pyx.orig h5py-3.7.0/h5py/h5t.pyx ---- h5py-3.7.0/h5py/h5t.pyx.orig 2022-06-14 16:31:22.964458579 +0000 -+++ h5py-3.7.0/h5py/h5t.pyx 2022-06-14 16:31:46.404768118 +0000 -@@ -282,18 +282,7 @@ cdef (int, int, int) _correct_float_info - nmant = finfo.nmant - maxexp = finfo.maxexp - minexp = finfo.minexp -- # workaround for numpy's buggy finfo on float128 on ppc64 archs -- if ftype_ == np.longdouble and MACHINE == 'ppc64': -- # values reported by hdf5 -- nmant = 116 -- maxexp = 1024 -- minexp = -1022 -- elif ftype_ == np.longdouble and MACHINE == 'ppc64le': -- # values reported by hdf5 -- nmant = 52 -- maxexp = 1024 -- minexp = -1022 -- elif nmant == 63 and finfo.nexp == 15: -+ if nmant == 63 and finfo.nexp == 15: - # This is an 80-bit float, correct mantissa size - nmant += 1 - diff --git a/SPECS/python-h5py/python-h5py.signatures.json b/SPECS/python-h5py/python-h5py.signatures.json index e1c9f05429..8afeb668e7 100644 --- a/SPECS/python-h5py/python-h5py.signatures.json +++ b/SPECS/python-h5py/python-h5py.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "h5py-3.7.0.tar.gz": "3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3" + "h5py-3.10.0.tar.gz": "d93adc48ceeb33347eb24a634fb787efc7ae4644e6ea4ba733d099605045c049" } -} \ No newline at end of file +} diff --git a/SPECS/python-h5py/python-h5py.spec b/SPECS/python-h5py/python-h5py.spec index 431525402e..750113365e 100644 --- a/SPECS/python-h5py/python-h5py.spec +++ b/SPECS/python-h5py/python-h5py.spec @@ -12,17 +12,14 @@ data types and data structures and their HDF5 equivalents vastly\ simplifies the process of reading and writing data from Python. Summary: A Python interface to the HDF5 library Name: h5py -Version: 3.7.0 -Release: 5%{?dist} +Version: 3.10.0 +Release: 1%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Mariner URL: https://www.h5py.org/ Source0: https://files.pythonhosted.org/packages/source/h/h5py/h5py-%{version}.tar.gz -# drop the unnecessary workaround for float128 type after -# https://fedoraproject.org/wiki/Changes/PPC64LE_Float128_Transition -# in F-36 -Patch0: h5py-3.7.0-ppc-float128.patch + BuildRequires: gcc BuildRequires: hdf5-devel >= 1.14.4 BuildRequires: liblzf-devel @@ -50,7 +47,7 @@ Requires: python%{python3_pkgversion}-six %prep %setup -q -c -n %{name}-%{version} -%patch0 + mv %{name}-%{version} serial cd serial %{__python3} api_gen.py @@ -69,7 +66,11 @@ export H5PY_SYSTEM_LZF=1 export CFLAGS="%{optflags} -fopenmp" cd serial %py3_build +cd - +# MPI +export CC=mpicc +export HDF5_MPI="ON" %install # Upstream requires a specific numpy without this @@ -92,6 +93,9 @@ cd - %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Thu May 23 2024 Riken Maharjan - 3.10.0-1 +- Update to 3.10.0 to match hdf5 1.14.4 + * Mon May 20 2024 George Mileka - 3.7.0-5 - Bumping the release version so that this package is re-built with the newer 1.14.4 hdf5 libraries. This ensures that the matching 1.14.4 .so files Will diff --git a/SPECS/python-tensorflow-estimator/python-tensorflow-estimator.spec b/SPECS/python-tensorflow-estimator/python-tensorflow-estimator.spec index 66b0e2d8e6..ac1863c68a 100644 --- a/SPECS/python-tensorflow-estimator/python-tensorflow-estimator.spec +++ b/SPECS/python-tensorflow-estimator/python-tensorflow-estimator.spec @@ -7,7 +7,7 @@ A high-level TensorFlow API that greatly simplifies machine learning programming Summary: A high-level TensorFlow API that greatly simplifies machine learning programming Name: python-%{pypi_name} Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -21,6 +21,7 @@ BuildRequires: python3-wheel BuildRequires: python3-six BuildRequires: python3-tf-nightly BuildRequires: python3-keras +BuildRequires: python3-h5py ExclusiveArch: x86_64 @@ -61,6 +62,9 @@ bazel --batch build //tensorflow_estimator/tools/pip_package:build_pip_package %{python3_sitelib}/* %changelog +* Fri May 24 2024 Riken Maharjan - 2.11.0-2 +- Explicitly BR python3-h5py. + * Fri Nov 11 2022 Riken Maharjan - 2.11.0-1 - Original version for CBL-Mariner. License Verified. diff --git a/cgmanifest.json b/cgmanifest.json index 2cd5798a48..307cb87746 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5130,8 +5130,8 @@ "type": "other", "other": { "name": "h5py", - "version": "3.7.0", - "downloadUrl": "https://files.pythonhosted.org/packages/source/h/h5py/h5py-3.7.0.tar.gz" + "version": "3.10.0", + "downloadUrl": "https://files.pythonhosted.org/packages/source/h/h5py/h5py-3.10.0.tar.gz" } } },