Compare commits
20 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f9a6eb4b6 | ||
|
|
d32bd4d4cf | ||
|
|
e96d793b3b | ||
|
|
85a007f3ad | ||
|
|
28ad0130f0 | ||
|
|
d28f4953e9 | ||
|
|
2873f4ee65 | ||
|
|
81522306ec | ||
|
|
d8f72494c7 | ||
|
|
9817876968 | ||
|
|
fc760dd654 | ||
|
|
09062d2813 | ||
|
|
4e6d69379d | ||
|
|
e61c958619 | ||
|
|
c5540f8c77 | ||
|
|
97cf6f69f8 | ||
|
|
64047973b9 | ||
|
|
43dfb0317f | ||
|
|
195d38a28b | ||
|
|
1c27c78dc3 |
5 changed files with 261 additions and 31 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,2 +1,4 @@
|
|||
/zfp-0.5.4.tar.gz
|
||||
/zfp-0.5.5.tar.gz
|
||||
/zfp-1.0.0.tar.gz
|
||||
/zfp-1.0.1.tar.gz
|
||||
|
|
|
|||
155
237.patch
Normal file
155
237.patch
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
From 37004a11e24a383d82b762dc44e542ddbd93ce6c Mon Sep 17 00:00:00 2001
|
||||
From: William Silversmith <william.silversmith@gmail.com>
|
||||
Date: Wed, 3 Jul 2024 15:26:38 -0400
|
||||
Subject: [PATCH 1/3] fix: setup.py + set language level for cython
|
||||
|
||||
---
|
||||
python/zfpy.pxd | 2 ++
|
||||
python/zfpy.pyx | 2 ++
|
||||
setup.py | 24 ++++++++++++++++++++----
|
||||
3 files changed, 24 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/python/zfpy.pxd b/python/zfpy.pxd
|
||||
index c92c29833..067bd90a4 100644
|
||||
--- a/python/zfpy.pxd
|
||||
+++ b/python/zfpy.pxd
|
||||
@@ -1,3 +1,5 @@
|
||||
+# cython: language_level=3
|
||||
+
|
||||
import cython
|
||||
cimport libc.stdint as stdint
|
||||
from libc.stddef cimport ptrdiff_t
|
||||
diff --git a/python/zfpy.pyx b/python/zfpy.pyx
|
||||
index 0b7a19e1c..0d1eb5230 100644
|
||||
--- a/python/zfpy.pyx
|
||||
+++ b/python/zfpy.pyx
|
||||
@@ -1,3 +1,5 @@
|
||||
+# cython: language_level=3
|
||||
+
|
||||
import sys
|
||||
import operator
|
||||
import functools
|
||||
diff --git a/setup.py b/setup.py
|
||||
index fa2da6efc..544ae2918 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,15 +1,31 @@
|
||||
from setuptools import setup, Extension
|
||||
-import numpy as np
|
||||
+
|
||||
+class NumpyImport:
|
||||
+ def __repr__(self):
|
||||
+ import numpy as np
|
||||
+
|
||||
+ return np.get_include()
|
||||
+
|
||||
+ __fspath__ = __repr__
|
||||
|
||||
setup(
|
||||
name="zfpy",
|
||||
+ setup_requires=["numpy", "cython"],
|
||||
version="1.0.1",
|
||||
author="Peter Lindstrom, Danielle Asher",
|
||||
author_email="zfp@llnl.gov",
|
||||
url="https://zfp.llnl.gov",
|
||||
description="zfp compression in Python",
|
||||
long_description="zfp is a compressed format for representing multidimensional floating-point and integer arrays. zfp provides compressed-array classes that support high throughput read and write random access to individual array elements. zfp also supports serial and parallel compression of whole arrays using both lossless and lossy compression with error tolerances. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.",
|
||||
- ext_modules=[Extension("zfpy", ["build/python/zfpy.c"],
|
||||
- include_dirs=["include", np.get_include()],
|
||||
- libraries=["zfp"], library_dirs=["build/lib64", "build/lib/Release"]), language_level = "3"]
|
||||
+ ext_modules=[
|
||||
+ Extension(
|
||||
+ "zfpy",
|
||||
+ sources=["python/zfpy.pyx"],
|
||||
+ include_dirs=["include", str(NumpyImport())],
|
||||
+ libraries=["zfp"],
|
||||
+ library_dirs=["build/lib64", "build/lib/Release"],
|
||||
+ language_level=3,
|
||||
+ lanugage="c",
|
||||
+ ),
|
||||
+ ],
|
||||
)
|
||||
|
||||
From 923f7c6ccab15e3820d8893226e44b9711d59a19 Mon Sep 17 00:00:00 2001
|
||||
From: William Silversmith <william.silversmith@gmail.com>
|
||||
Date: Wed, 3 Jul 2024 15:30:14 -0400
|
||||
Subject: [PATCH 2/3] chore: add trove classifiers
|
||||
|
||||
---
|
||||
setup.py | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 544ae2918..90b37865c 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -15,6 +15,7 @@ def __repr__(self):
|
||||
author="Peter Lindstrom, Danielle Asher",
|
||||
author_email="zfp@llnl.gov",
|
||||
url="https://zfp.llnl.gov",
|
||||
+ license="License :: OSI Approved :: BSD License",
|
||||
description="zfp compression in Python",
|
||||
long_description="zfp is a compressed format for representing multidimensional floating-point and integer arrays. zfp provides compressed-array classes that support high throughput read and write random access to individual array elements. zfp also supports serial and parallel compression of whole arrays using both lossless and lossy compression with error tolerances. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.",
|
||||
ext_modules=[
|
||||
@@ -28,4 +29,20 @@ def __repr__(self):
|
||||
lanugage="c",
|
||||
),
|
||||
],
|
||||
+ classifiers=[
|
||||
+ "Intended Audience :: Developers",
|
||||
+ "Development Status :: 4 - Beta",
|
||||
+ "License :: OSI Approved :: BSD License",
|
||||
+ "Programming Language :: Python :: 3",
|
||||
+ "Programming Language :: Python :: 3.8",
|
||||
+ "Programming Language :: Python :: 3.9",
|
||||
+ "Programming Language :: Python :: 3.10",
|
||||
+ "Programming Language :: Python :: 3.11",
|
||||
+ "Programming Language :: Python :: 3.12",
|
||||
+ "Topic :: Scientific/Engineering :: Image Processing",
|
||||
+ "Topic :: System :: Archiving :: Compression",
|
||||
+ "Operating System :: POSIX",
|
||||
+ "Operating System :: MacOS",
|
||||
+ "Operating System :: Microsoft :: Windows :: Windows 10",
|
||||
+ ],
|
||||
)
|
||||
|
||||
From 3b11d3169170e7125414fee1e4bb3f8ad753648d Mon Sep 17 00:00:00 2001
|
||||
From: William Silversmith <william.silversmith@gmail.com>
|
||||
Date: Wed, 3 Jul 2024 15:41:18 -0400
|
||||
Subject: [PATCH 3/3] install: add MANIFEST.in and pyproject.toml
|
||||
|
||||
---
|
||||
MANIFEST.in | 6 ++++++
|
||||
pyproject.toml | 8 ++++++++
|
||||
2 files changed, 14 insertions(+)
|
||||
create mode 100644 MANIFEST.in
|
||||
create mode 100644 pyproject.toml
|
||||
|
||||
diff --git a/MANIFEST.in b/MANIFEST.in
|
||||
new file mode 100644
|
||||
index 000000000..a34c60c68
|
||||
--- /dev/null
|
||||
+++ b/MANIFEST.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+include python/zfpy.pxd
|
||||
+include python/zfpy.pyx
|
||||
+recursive-include include *.h
|
||||
+recursive-include src *.c *.h
|
||||
+include LICENSE
|
||||
+include pyproject.toml
|
||||
\ No newline at end of file
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
new file mode 100644
|
||||
index 000000000..f43c81a75
|
||||
--- /dev/null
|
||||
+++ b/pyproject.toml
|
||||
@@ -0,0 +1,8 @@
|
||||
+[build-system]
|
||||
+requires = [
|
||||
+ "setuptools",
|
||||
+ "wheel",
|
||||
+ "cython",
|
||||
+ "oldest-supported-numpy; python_version<'3.9'",
|
||||
+ 'numpy; python_version>="3.9"',
|
||||
+]
|
||||
\ No newline at end of file
|
||||
65
changelog
Normal file
65
changelog
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1.0.1-7
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Tue Jan 21 2025 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.0.1-6
|
||||
- Add Python subpackage
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.1-4
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Dec 16 2023 Orion Poplawski <orion@nwra.com> - 1.0.1-1
|
||||
- Update to 1.0.1
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sun Jun 04 2023 Orion Poplawski <orion@nwra.com> - 1.0.0-1
|
||||
- Update to 1.0.0
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Aug 08 2020 Orion Poplawski <orion@nwra.com> - 0.5.5-1
|
||||
- Update to 0.5.5
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 24 2019 Orion Poplawski <orion@nwra.com> - 0.5.4-1
|
||||
- Update to 0.5.4
|
||||
|
||||
* Tue May 9 2017 Orion Poplawski <orion@cora.nwra.com> - 0.5.1-1
|
||||
- Initial Fedora package
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (zfp-0.5.5.tar.gz) = c043cee73f6e972e047452552ab2ceb9247a6747fdb7e5f863aeab3a05208737c0bcabbe29f3c10e5c1aba961ec47aa6a0abdb395486fa0d5fb16a4ad45733c4
|
||||
SHA512 (zfp-1.0.1.tar.gz) = 5bbd98ed2f98e75c654afa863cab3023abb2eeb8f203f9049c75d5dbdf4b364cfb5c8378e10e6aaeaf13242315ad4949b06619810a67b3adaed095b7e8a48d5a
|
||||
|
|
|
|||
68
zfp.spec
68
zfp.spec
|
|
@ -1,16 +1,17 @@
|
|||
%undefine __cmake_in_source_build
|
||||
%undefine __cmake3_in_source_build
|
||||
|
||||
Name: zfp
|
||||
Version: 0.5.5
|
||||
Release: 1%{?dist}
|
||||
Version: 1.0.1
|
||||
Release: %autorelease
|
||||
Summary: Library for compressed numerical arrays with high throughput R/W random access
|
||||
|
||||
License: BSD
|
||||
URL: https://computation.llnl.gov/projects/floating-point-compression
|
||||
License: BSD-3-Clause
|
||||
URL: https://computing.llnl.gov/projects/zfp
|
||||
Source0: https://github.com/LLNL/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# Fix setup.py syntax and add pyproject.toml.
|
||||
Patch: https://github.com/LLNL/%{name}/pull/237.patch
|
||||
|
||||
BuildRequires: cmake3
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
%description
|
||||
|
|
@ -51,49 +52,56 @@ The %{name}-devel package contains libraries and header files for
|
|||
developing applications that use %{name}.
|
||||
|
||||
|
||||
%package -n python3-zfpy
|
||||
Summary: zfp compression in Python
|
||||
|
||||
BuildRequires: python3-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n python3-zfpy
|
||||
The python3-zfpy package contains a Python library for using %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p1
|
||||
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
|
||||
%build
|
||||
%cmake3
|
||||
%cmake3_build
|
||||
%cmake -DCMAKE_SKIP_INSTALL_RPATH=YES -DHAVE_LIBM_MATH=YES
|
||||
%cmake_build
|
||||
|
||||
export LDFLAGS="$LDFLAGS -L$PWD/%{_vpath_builddir}/%{_lib}/"
|
||||
%pyproject_wheel
|
||||
|
||||
|
||||
%install
|
||||
%cmake3_install
|
||||
%cmake_install
|
||||
|
||||
%pyproject_install
|
||||
%pyproject_save_files -l zfpy
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%doc README.md VERSIONS.md
|
||||
%doc README.md NOTICE CHANGELOG.md
|
||||
%license LICENSE
|
||||
%{_libdir}/*.so.*
|
||||
%{_bindir}/zfp
|
||||
%{_libdir}/libzfp.so.1*
|
||||
|
||||
%files devel
|
||||
%doc examples
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/libzfp.so
|
||||
%{_libdir}/cmake/zfp/
|
||||
|
||||
%files -n python3-zfpy -f %{pyproject_files}
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Aug 08 2020 Orion Poplawski <orion@nwra.com> - 0.5.5-1
|
||||
- Update to 0.5.5
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 24 2019 Orion Poplawski <orion@nwra.com> - 0.5.4-1
|
||||
- Update to 0.5.4
|
||||
|
||||
* Tue May 9 2017 Orion Poplawski <orion@cora.nwra.com> - 0.5.1-1
|
||||
- Initial Fedora package
|
||||
%autochangelog
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue