Compare commits

...
Sign in to create a new pull request.

14 commits

Author SHA1 Message Date
Fedora Release Engineering
1603b93575 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:35:11 +00:00
Fedora Release Engineering
0fbc29a576 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:01:02 +00:00
Jaroslav Škarvada
d4142ddb03 More fixes for cmake-4
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-01-13 18:34:12 +01:00
Jaroslav Škarvada
c7dedb0da5 Fixed build with cmake-4
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-01-13 17:07:47 +01:00
Fedora Release Engineering
c84a41b8ad Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:11:22 +00:00
Fedora Release Engineering
7479aec431 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:32:48 +00:00
Miroslav Suchý
14b590bbfe convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-04 22:41:54 +02:00
Fedora Release Engineering
7f6b4cc044 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:56:53 +00:00
Fedora Release Engineering
c35a1a9cbb Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:05:48 +00:00
Fedora Release Engineering
03e815cd4f Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:48:12 +00:00
Jaroslav Škarvada
762d18bc79 Fixed FTBFS with gcc-13
Resolves: rhbz#2171754

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2023-02-23 15:11:50 +01:00
Fedora Release Engineering
45b1ae399f Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:26:38 +00:00
Fedora Release Engineering
f87b06fd55 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:03:02 +00:00
Jaroslav Škarvada
932e918fdd New version
Resolves: rhbz#2047102
2022-02-22 22:12:41 +01:00
6 changed files with 100 additions and 103 deletions

4
.gitignore vendored
View file

@ -1,3 +1 @@
vmmlib-*.tar.xz
vmmlib_*.tgz
/vmmlib-1.6.2-20140319git925a709b.tar.bz2
/vmmlib-*.tar.gz

View file

@ -1,57 +0,0 @@
From b3ea45d53845dc307e3d58333a076f595369dcd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Thu, 27 Aug 2020 19:49:38 +0200
Subject: [PATCH] remove lapack tests
---
CMakeLists.txt | 34 ----------------------------------
1 file changed, 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cf6f5c..dc62a45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,40 +166,6 @@ set(TESTS
# tests/vmmlib_lapack_main.cpp
# tests/vmmlib_performance_tests_main.cpp
)
-if(LAPACK_FOUND)
- set(LAPACK_HEADERS
- include/vmmlib/lapack/detail/clapack.h
- include/vmmlib/lapack/detail/f2c.h )
- add_definitions(-DVMMLIB_USE_LAPACK)
- list(APPEND TESTS
- tests/blas_daxpy_test.cpp
- tests/blas_dgemm_test.cpp
- tests/blas_dot_test.cpp
- tests/cp3_tensor_test.cpp
- tests/lapack_gaussian_elimination_test.cpp
- tests/lapack_linear_least_squares_test.cpp
- tests/lapack_svd_test.cpp
- tests/lapack_sym_eigs_test.cpp
- tests/matrix_pseudoinverse_test.cpp
- tests/qtucker3_tensor_test.cpp
- tests/svd_lapack_vs_old.cpp
- tests/t3_hooi_test.cpp
- tests/t3_hopm_test.cpp
- tests/t3_hosvd_test.cpp
- tests/t3_ihooi_test.cpp
- tests/t3_ihopm_test.cpp
- tests/t3_ttm_test.cpp
- tests/tensor3_iterator_test.cpp
- tests/tensor3_test.cpp
- tests/tucker3_exporter_importer_test.cpp
- tests/tucker3_tensor_test.cpp
- tests/t4_hooi_test.cpp
- tests/t4_converter_test.cpp
- tests/tensor4_test.cpp
- tests/t4_ttm_test.cpp
-
-)
-endif()
if(BLAS_FOUND)
add_definitions(-DVMMLIB_USE_BLAS)
--
2.25.2

View file

@ -1 +1 @@
0587926760e48106a975270e0951a721 vmmlib-1.6.2-20140319git925a709b.tar.bz2
SHA512 (vmmlib-1.8.0-20220222git364732e3.tar.gz) = 3d6a31739a183848b5a665eda71a34ac99e63047d62a308104a1c893de18ea76bb27434dc0dec9f57623217c56b90722c5515408a8bd1b88c0dd15906ce12dfe

View file

@ -0,0 +1,26 @@
diff --git a/CMake/common/Common.cmake b/CMake/common/Common.cmake
index 833201e..4b103f0 100644
--- a/CMake/common/Common.cmake
+++ b/CMake/common/Common.cmake
@@ -12,7 +12,7 @@ if(CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR)
message(FATAL_ERROR "Cannot install into build directory")
endif()
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
include(CMakeCompatibility)
if(EXISTS ${PROJECT_SOURCE_DIR}/CMake/${PROJECT_NAME}.cmake)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5498c8..eedffe0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
# Copyright (c) 2011 Daniel Pfeifer <daniel@pfeifer-mail.de>
# 2011-2014 Stefan.Eilemann@epfl.ch
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(vmmlib)
set(VERSION_MAJOR 1)

View file

@ -0,0 +1,12 @@
diff --git a/vmmlib/vector.hpp b/vmmlib/vector.hpp
index 4adc2de..dfbf9fb 100644
--- a/vmmlib/vector.hpp
+++ b/vmmlib/vector.hpp
@@ -45,6 +45,7 @@
#include <cstring>
#include <limits>
#include <algorithm>
+#include <cstdint>
namespace vmml
{

View file

@ -1,38 +1,29 @@
%undefine __cmake_in_source_build
%global git_commit 925a709ba0c98d8c0beabd0e34477971946c10be
%global git_date 20140319
%global git_commit 364732e348679893686ae46e8747cb17b0656d86
%global git_date 20220222
%global git_short_commit %(echo %{git_commit} | cut -c -8)
%global git_suffix %{git_date}git%{git_short_commit}
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%global blaslib flexiblas
%global cmake_blas_flags -DBLA_VENDOR=FlexiBLAS
%else
%global blaslib openblas
%global blasvar o
%global cmake_blas_flags -DBLAS_FOUND=TRUE -DLAPACK_FOUND=TRUE -DBLAS_LIBRARIES=%{_libdir}/lib%{blaslib}%{blasvar}.so
%endif
# git clone https://github.com/VMML/vmmlib.git
# cd %%{name}
# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
# bzip2 > ../%%{name}-%%{version}-%%{git_suffix}.tar.bz2
Name: vmmlib
Version: 1.6.2
Release: 18.%{git_suffix}%{?dist}
Version: 1.8.0
Release: 0.11.%{git_suffix}%{?dist}
Summary: A vector and matrix math library implemented using C++ templates
License: BSD
# Automatically converted from old format: BSD - review is highly recommended.
License: LicenseRef-Callaway-BSD
#URL: http://vmmlib.sourceforge.net/
URL: http://github.com/VMML/vmmlib/
#Source0: http://github.com/VMML/vmmlib/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz
Source0: %{name}-%{version}-%{git_suffix}.tar.bz2
# BLAS/LAPACK tests are broken
Patch0: 0001-remove-lapack-tests.patch
#Source0: http://github.com/VMML/vmmlib/archive/release-%%{version}.tar.gz#/%%{name}-release-%%{version}.tar.gz
Source0: %{url}/archive/%{git_commit}/%{name}-%{version}-%{git_suffix}.tar.gz
BuildArch: noarch
BuildRequires: %{blaslib}-devel, f2c, gcc-c++
BuildRequires: doxygen, cmake
BuildRequires: gcc-c++
BuildRequires: doxygen
BuildRequires: cmake
BuildRequires: boost-devel
# https://github.com/VMML/vmmlib/pull/101
Patch: vmmlib-1.8.0-gcc-13-fix.patch
# https://github.com/VMML/vmmlib/issues/103
# https://github.com/Eyescale/CMake/pull/606
Patch: vmmlib-1.8.0-cmake-4-fix.patch
%description
vmmlib is a vector and matrix math library implemented using C++ templates.
@ -53,36 +44,63 @@ More advanced functionality include solvers, frustum computations and frustum
culling classes, and spatial data structures.
%prep
%autosetup -p1
%autosetup -p1 -n %{name}-%{git_commit}
%build
export CXXFLAGS="%{optflags} -I%{_includedir}/%{blaslib}"
%cmake %{cmake_blas_flags}
%cmake
%cmake_build
%install
%cmake_install
# move docs to right place
mkdir _tmpdoc
mv %{buildroot}%{_datadir}/%{name}/{AUTHORS,LICENSE.txt,ACKNOWLEDGEMENTS,README.md} _tmpdoc/
# move cmake files to right place
mkdir -p %{buildroot}%{_datadir}/cmake/Modules/
mv %{buildroot}%{_datadir}/%{name}/CMake/*.cmake %{buildroot}%{_datadir}/cmake/Modules/
rmdir %{buildroot}%{_datadir}/%{name}/CMake
rm -r %{buildroot}%{_datadir}/vmmlib/tests/*
rmdir %{buildroot}%{_datadir}/vmmlib/tests
mkdir -p %{buildroot}%{_includedir}
cp -a vmmlib %{buildroot}%{_includedir}
%check
export FLEXIBLAS=netlib
%ctest
%files devel
%doc RELNOTES.md CHANGES _tmpdoc/*
%license LICENSE.txt
%doc doc/RELNOTES.md CHANGES README.md AUTHORS ACKNOWLEDGEMENTS
%{_includedir}/vmmlib
%{_libdir}/pkgconfig/vmmlib.pc
%{_datadir}/cmake/Modules/vmmlib*.cmake
%{_datadir}/vmmlib/CMake/*.cmake
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.11.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.10.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.9.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.8.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.8.0-0.7.20220222git364732e3
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.6.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.5.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.4.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.3.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.2.20220222git364732e3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Feb 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1.8.0-0.1.20220222git364732e3
- New version
Resolves: rhbz#2047102
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-18.20140319git925a709b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild