SHA256
1
0
forked from pool/normaliz

Accepting request 563096 from science

- Update to version 3.5.1:
  * Uniqueness in output of not uniqely determined results (bases
    of sublattices, equations), necessary to make all tests yield
    the same results on all.
systems
- Drop 0001-Fix-compiler-warnings-in-matrix.cpp.patch:
  incorporated upstream. (forwarded request 563067 from badshah400)

OBS-URL: https://build.opensuse.org/request/show/563096
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/normaliz?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2018-01-10 22:36:51 +00:00 committed by Git OBS Bridge
commit c5bca2bfca
5 changed files with 16 additions and 55 deletions

View File

@ -1,48 +0,0 @@
From c67e8c9246ba6e51fb9f35da4bec8e23a744f4f7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 25 Dec 2017 14:21:54 +0100
Subject: [PATCH] Fix compiler warnings in matrix.cpp
Add a return clause, because assert() may be replaced with nothing by
the preprocessor under -DNDEBUG.
matrix.cpp: In member function 'std::vector<Integer> libnormaliz::Matrix<Integer>::VxM_div(const
std::vector<Integer>&, const Integer&, bool&) const [with Integer = double]':
matrix.cpp:942:1: warning: no return statement in function returning non-void [-Wreturn-type]
matrix.cpp:2262:1: warning: no return statement in function returning non-void [-Wreturn-type]
matrix.cpp:2696:1: warning: no return statement in function returning non-void [-Wreturn-type]
---
source/libnormaliz/matrix.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/source/libnormaliz/matrix.cpp b/source/libnormaliz/matrix.cpp
index ebec2958..c551c4d2 100644
--- a/source/libnormaliz/matrix.cpp
+++ b/source/libnormaliz/matrix.cpp
@@ -939,6 +939,7 @@ vector<Integer> Matrix<Integer>::VxM_div(const vector<Integer>& v, const Integer
template<>
vector<nmz_float> Matrix<nmz_float>::VxM_div(const vector<nmz_float>& v, const nmz_float& divisor, bool& success) const{
assert(false);
+ return {};
}
//---------------------------------------------------------------------------
@@ -2259,6 +2260,7 @@ template<>
bool Matrix<nmz_float>::SmithNormalForm_inner(size_t& rk, Matrix<nmz_float>& Right){
assert(false);
+ return {};
}
// Converts "this" into Smith normal form, returns column transformation matrix
@@ -2693,6 +2695,7 @@ vector<mpz_class> Matrix<mpz_class>::optimal_subdivision_point() const{
template<>
vector<nmz_float> Matrix<nmz_float>::optimal_subdivision_point_inner() const{
assert(false);
+ return {};
}
/*
--
2.15.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:731c0ed673a0124149e1950be389694d5ed3d0e9810515380ba537aec03e4aca
size 3912117

3
normaliz-3.5.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5611ba7528d16090516252cf9cf61893a2731a929732dea58489b0610160d647
size 3936847

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Jan 9 15:57:34 UTC 2018 - badshah400@gmail.com
- Update to version 3.5.1:
* Uniqueness in output of not uniqely determined results (bases
of sublattices, equations), necessary to make all tests yield
the same results on all.
systems
- Drop 0001-Fix-compiler-warnings-in-matrix.cpp.patch:
incorporated upstream.
-------------------------------------------------------------------
Mon Dec 25 13:13:38 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package normaliz
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: normaliz
Version: 3.5.0
Version: 3.5.1
Release: 0
Summary: Tools for computations in affine monoids and rational cones
License: GPL-3.0+
@ -25,7 +25,6 @@ Group: Productivity/Scientific/Math
Url: https://www.normaliz.uni-osnabrueck.de/
Source: https://github.com/Normaliz/Normaliz/releases/download/v%version/%name-%version.tar.gz
Patch1: 0001-Fix-compiler-warnings-in-matrix.cpp.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
#maybe with flint-devel later on
@ -78,7 +77,6 @@ the Normaliz computations from any C++ program.
%prep
%setup -q
%patch -P 1 -p1
%build
pushd source/