jjames pushed to latte-integrale (master). "New upstream release."
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 9 16:26:58 UTC 2015
From 2119b92ffefe24b5db1e068fca4b3c2393a97103 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry at gmail.com>
Date: Sat, 9 May 2015 10:26:47 -0600
Subject: New upstream release.
diff --git a/.gitignore b/.gitignore
index 4319fe2..a257bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/latte-integrale-1.7.2.tar.gz
+/latte-integrale-1.7.3.tar.gz
diff --git a/latte-integrale-warning.patch b/latte-integrale-warning.patch
index e618f88..5457f11 100644
--- a/latte-integrale-warning.patch
+++ b/latte-integrale-warning.patch
@@ -1,5 +1,5 @@
---- ./code/latte/buildPolytopes/BuildRandomPolynomials.cpp.orig 2013-09-29 13:02:47.000000000 -0600
-+++ ./code/latte/buildPolytopes/BuildRandomPolynomials.cpp 2014-01-06 12:30:00.000000000 -0700
+--- ./code/latte/buildPolytopes/BuildRandomPolynomials.cpp.orig 2014-10-09 15:51:30.000000000 -0600
++++ ./code/latte/buildPolytopes/BuildRandomPolynomials.cpp 2015-05-03 12:34:07.324362727 -0600
@@ -20,7 +20,7 @@ string makeRandomMonomial(const int dim,
//We treat totalDegree as the amount left over...how much powers we still have to add.
const int stepSize = 2; //add no more than 1 powers to a term at a time.
@@ -9,8 +9,8 @@
int newPower;
stringstream poly;
---- ./code/latte/dual.cpp.orig 2013-09-29 13:02:51.000000000 -0600
-+++ ./code/latte/dual.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/dual.cpp.orig 2014-10-09 15:51:52.000000000 -0600
++++ ./code/latte/dual.cpp 2015-05-03 12:34:07.334361864 -0600
@@ -71,16 +71,14 @@ static void dualizeCone_with_cdd(listCon
{
char cddInFileName[PATH_MAX];
@@ -30,8 +30,8 @@
strcpy(cddInFileName,"latte_cdd.ine");
---- ./code/latte/ehrhart3.cpp.orig 2010-08-24 15:11:26.000000000 -0600
-+++ ./code/latte/ehrhart3.cpp 2014-01-06 12:30:00.000000000 -0700
+--- ./code/latte/ehrhart3.cpp.orig 2014-10-09 15:51:36.000000000 -0600
++++ ./code/latte/ehrhart3.cpp 2015-05-03 12:34:07.335361778 -0600
@@ -33,7 +33,7 @@ void EhrhartPolyRootFinder::saveMatlab()
file.open(matlabCommands.c_str());
@@ -50,8 +50,8 @@
file << " + " << poly[i] << "* t^" << i << " ";
file << ":\n";
file << "theRoots := fsolve(p = 0, t, complex):\n";
---- ./code/latte/ehrhart.cpp.orig 2013-09-29 13:02:50.000000000 -0600
-+++ ./code/latte/ehrhart.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/ehrhart.cpp.orig 2014-10-09 15:51:39.000000000 -0600
++++ ./code/latte/ehrhart.cpp 2015-05-03 12:34:07.335361778 -0600
@@ -63,8 +63,7 @@ int main(int argc, char *argv[]) {
#ifdef SUN
struct tms tms_buf;
@@ -91,8 +91,8 @@
mat_ZZ ProjU;
ProjU.SetDims(numOfVars, numOfVars);
oldnumofvars = numOfVars;
---- ./code/latte/Grobner.cpp.orig 2013-09-29 13:02:50.000000000 -0600
-+++ ./code/latte/Grobner.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/Grobner.cpp.orig 2014-10-09 15:51:40.000000000 -0600
++++ ./code/latte/Grobner.cpp 2015-05-03 12:34:07.336361692 -0600
@@ -162,7 +162,7 @@ void readLatteGrobProblem(const char *fi
char* grobner, ZZ bignum) {
int i,j,eq,ind,numOfVectors,numOfEquations;
@@ -102,8 +102,8 @@
vec_ZZ b;
/* Reads numOfVars, matrix A, and rhs b. */
---- ./code/latte/IntegralHull.cpp.orig 2014-01-10 15:12:33.000000000 -0700
-+++ ./code/latte/IntegralHull.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/IntegralHull.cpp.orig 2014-10-09 15:51:38.000000000 -0600
++++ ./code/latte/IntegralHull.cpp 2015-05-03 12:34:07.337361606 -0600
@@ -855,7 +855,7 @@ listVector* IntegralHull(listCone* cones
{
cerr << "Computing Integer Hull: " ;
@@ -122,8 +122,8 @@
int Hull_Counter = 0;
while(counter != 0)
{
---- ./code/latte/integration/burstTrie.hpp.orig 2011-05-16 16:47:55.000000000 -0600
-+++ ./code/latte/integration/burstTrie.hpp 2014-01-06 12:30:00.000000000 -0700
+--- ./code/latte/integration/burstTrie.hpp.orig 2014-10-09 15:49:59.000000000 -0600
++++ ./code/latte/integration/burstTrie.hpp 2015-05-03 12:34:07.337361606 -0600
@@ -151,7 +151,7 @@ public:
}
@@ -133,8 +133,8 @@
while (curTerm && curTerm->lessThan(newTerm, equal))
{
---- ./code/latte/integration/consumers.h.orig 2011-08-27 21:09:29.000000000 -0600
-+++ ./code/latte/integration/consumers.h 2014-01-06 12:30:00.000000000 -0700
+--- ./code/latte/integration/consumers.h.orig 2014-10-09 15:49:58.000000000 -0600
++++ ./code/latte/integration/consumers.h 2015-05-03 12:34:07.338361520 -0600
@@ -41,6 +41,7 @@ public:
template <class T> class MonomialLoadConsumer : public MonomialConsumer<T> {
public:
@@ -161,8 +161,8 @@
private:
linFormProductSum* formProductSum;
};
---- ./code/latte/integration/iterators.hpp.orig 2011-07-11 18:26:36.000000000 -0600
-+++ ./code/latte/integration/iterators.hpp 2014-01-06 12:30:00.000000000 -0700
+--- ./code/latte/integration/iterators.hpp.orig 2014-10-09 15:49:58.000000000 -0600
++++ ./code/latte/integration/iterators.hpp 2015-05-03 12:34:07.338361520 -0600
@@ -134,7 +134,7 @@ public:
return &curTerm;
}
@@ -172,8 +172,8 @@
{
if (triePath)
delete[] triePath;
---- ./code/latte/integration/newIntegration.cpp.orig 2014-01-10 15:12:24.000000000 -0700
-+++ ./code/latte/integration/newIntegration.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/integration/newIntegration.cpp.orig 2015-04-21 11:03:58.000000000 -0600
++++ ./code/latte/integration/newIntegration.cpp 2015-05-03 12:34:07.339361433 -0600
@@ -35,10 +35,10 @@ void convertToSimplex(simplexZZ &mySimpl
t = line.find("[", t) + 1;
t = line.find("[", t) + 1;
@@ -205,8 +205,8 @@
vec_ZZ l;
//if (forms.varCount!=mySimplex.d) {cout<<"The dimensions of the polynomial and simplex don't match. Please check!"<<forms.varCount<<"<>"<<mySimplex.d<<endl;exit(1);};
l.SetLength(mySimplex.d);
---- ./code/latte/integration/PolyRep.cpp.orig 2013-09-29 13:01:45.000000000 -0600
-+++ ./code/latte/integration/PolyRep.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/integration/PolyRep.cpp.orig 2014-10-09 15:49:59.000000000 -0600
++++ ./code/latte/integration/PolyRep.cpp 2015-05-03 12:34:07.339361433 -0600
@@ -30,8 +30,8 @@ void _parseMonomials(_MonomialConsumer<R
}
consumer->setDimension(varCount);
@@ -251,8 +251,8 @@
int myIndex;
for (int i = 0; i < myPoly.varCount; i++)
{
---- ./code/latte/integration/PolyTrie.cpp.orig 2013-09-29 13:01:45.000000000 -0600
-+++ ./code/latte/integration/PolyTrie.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/integration/PolyTrie.cpp.orig 2014-10-09 15:49:57.000000000 -0600
++++ ./code/latte/integration/PolyTrie.cpp 2015-05-03 12:34:07.340361347 -0600
@@ -32,8 +32,8 @@ void parseMonomials(MonomialConsumer<Rat
}
consumer->setDimension(varCount);
@@ -329,8 +329,8 @@
{
cout << i << " started" << endl;
cout << printLinForms(plf[i]).c_str() << endl;
---- ./code/latte/integration/residue.cpp.orig 2014-01-10 15:12:24.000000000 -0700
-+++ ./code/latte/integration/residue.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/integration/residue.cpp.orig 2014-10-09 15:49:57.000000000 -0600
++++ ./code/latte/integration/residue.cpp 2015-05-03 12:34:07.340361347 -0600
@@ -301,7 +301,7 @@ void computeResidueLawrence(const int d,
//cout << " d=" << d << ", M=" << M << " ";
//coneTerm.printTerm();
@@ -340,8 +340,8 @@
//int counter[1000];//counter counts number of appearances of each index[i]
//again, put this on the stack. Don't want the time requesting memory from the heap because this function is called many times.
---- ./code/latte/maximize.cpp.orig 2013-09-29 13:02:50.000000000 -0600
-+++ ./code/latte/maximize.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/maximize.cpp.orig 2014-10-09 15:51:47.000000000 -0600
++++ ./code/latte/maximize.cpp 2015-05-03 12:34:07.340361347 -0600
@@ -63,8 +63,7 @@ int main(int argc, char *argv[]) {
#ifdef SUN
struct tms tms_buf;
@@ -380,8 +380,8 @@
mat_ZZ ProjU;
ProjU.SetDims(numOfVars, numOfVars);
oldnumofvars = numOfVars;
---- ./code/latte/minimize.cpp.orig 2013-09-29 13:02:49.000000000 -0600
-+++ ./code/latte/minimize.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/minimize.cpp.orig 2014-10-09 15:51:36.000000000 -0600
++++ ./code/latte/minimize.cpp 2015-05-03 12:34:07.341361261 -0600
@@ -63,8 +63,7 @@ int main(int argc, char *argv[]) {
#ifdef SUN
struct tms tms_buf;
@@ -420,8 +420,8 @@
mat_ZZ ProjU;
ProjU.SetDims(numOfVars, numOfVars);
oldnumofvars = numOfVars;
---- ./code/latte/normalize/normalize.cpp.orig 2014-01-10 15:12:27.000000000 -0700
-+++ ./code/latte/normalize/normalize.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/normalize/normalize.cpp.orig 2014-10-09 15:49:36.000000000 -0600
++++ ./code/latte/normalize/normalize.cpp 2015-05-03 12:34:07.341361261 -0600
@@ -395,12 +395,6 @@ static void open_output_and_stats()
_4ti2_::out = &fortytwolog;
}
@@ -443,8 +443,8 @@
}
else {
// Read a cone.
---- ./code/latte/normalize/normaliz_wrapper.cpp.orig 2013-09-29 13:01:39.000000000 -0600
-+++ ./code/latte/normalize/normaliz_wrapper.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/normalize/normaliz_wrapper.cpp.orig 2014-10-09 15:49:37.000000000 -0600
++++ ./code/latte/normalize/normaliz_wrapper.cpp 2015-05-03 12:34:07.342361175 -0600
@@ -426,7 +426,7 @@ listVector* pullOneRay(char* simplicialC
smallCones=extractNonDominatedVectors(smallCones,mainOrbits,numOfVars);
printf("uncovered smallCones = %d -> ",lengthListVector(smallCones));
@@ -485,8 +485,8 @@
if (strncmp(action,"pullRay",7)==0) {
mainCones=pullOneRay(simplicialConesFileName,mainConesInFileName,
---- ./code/latte/preprocess.cpp.orig 2014-01-07 13:05:17.000000000 -0700
-+++ ./code/latte/preprocess.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/preprocess.cpp.orig 2014-10-09 15:51:37.000000000 -0600
++++ ./code/latte/preprocess.cpp 2015-05-03 12:34:07.342361175 -0600
@@ -632,12 +632,11 @@ listVector* preprocessProblem(listVector
listVector* preprocessProblem_hack(listVector *equations, listVector *inequalities,
vec_ZZ **generators, int *numOfVars, vec_ZZ & cost, mat_ZZ & ProjU,
@@ -512,9 +512,9 @@
while (tmp) {
rhs[ind2] = (tmp->first)[0];
---- ./code/latte/ReadingFile.cpp.orig 2014-01-10 15:12:33.000000000 -0700
-+++ ./code/latte/ReadingFile.cpp 2014-02-10 07:00:00.000000000 -0700
-@@ -616,7 +616,7 @@ void readLatteProblem(const char *fileNa
+--- ./code/latte/ReadingFile.cpp.orig 2015-04-21 11:43:23.000000000 -0600
++++ ./code/latte/ReadingFile.cpp 2015-05-03 12:34:07.343361088 -0600
+@@ -617,7 +617,7 @@ void readLatteProblem(const char *fileNa
char* grobner, char * Vrep) {
int i,j,eq,ind,numOfVectors,numOfEquations;
vec_ZZ indexEquations;
@@ -523,7 +523,7 @@
vec_ZZ b;
ZZ bignum;
/* Reads numOfVars, matrix A, and rhs b. */
-@@ -906,7 +906,7 @@ int CDDstylereadLatteProblem(const char
+@@ -907,7 +907,7 @@ int CDDstylereadLatteProblem(const char
char* grobner) {
int i,j,eq,ind, length = 0, f = 0, numOfVectors,numOfEquations;
vec_ZZ indexEquations;
@@ -532,8 +532,8 @@
vec_ZZ b;
string tmpString;
---- ./code/latte/ReadPolyhedron.cpp.orig 2011-07-20 13:51:36.000000000 -0600
-+++ ./code/latte/ReadPolyhedron.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/ReadPolyhedron.cpp.orig 2015-04-21 11:48:26.000000000 -0600
++++ ./code/latte/ReadPolyhedron.cpp 2015-05-03 12:34:07.343361088 -0600
@@ -38,6 +38,8 @@
#include "print.h"
#include "dual.h"
@@ -551,7 +551,7 @@
-
if (expect_filename) {
cerr << "The input file name is missing." << endl;
- THROW_LATTE(LattException::ue_FileNameMissing);
+ THROW_LATTE(LattException::ue_FileNameMissing, 0);
@@ -1210,11 +1210,11 @@ RationalNTL ReadPolyhedronDataRecursive:
{
for(int j = 1; j < mat.NumCols(); ++i)
@@ -565,8 +565,8 @@
//start here --uncomment
// mpz_class nDilation
// dilationNum = 1;
---- ./code/latte/ReadPolyhedron.h.orig 2011-07-20 11:05:48.000000000 -0600
-+++ ./code/latte/ReadPolyhedron.h 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/ReadPolyhedron.h.orig 2014-10-09 15:51:43.000000000 -0600
++++ ./code/latte/ReadPolyhedron.h 2015-05-03 12:34:07.344361002 -0600
@@ -162,6 +162,4 @@ Polyhedron *ReadLatteStyleVrep(const cha
/* Create a polyhedron from a vrep matrix. */
@@ -574,8 +574,8 @@
-
-static dd_MatrixPtr ReadCddStyleMatrix(const string &filename);
#endif
---- ./code/latte/ReadSubcones.cpp.orig 2010-08-24 15:11:23.000000000 -0600
-+++ ./code/latte/ReadSubcones.cpp 2014-01-06 12:30:00.000000000 -0700
+--- ./code/latte/ReadSubcones.cpp.orig 2014-10-09 15:51:42.000000000 -0600
++++ ./code/latte/ReadSubcones.cpp 2015-05-03 12:34:07.344361002 -0600
@@ -164,7 +164,7 @@ void
IncrementalVectorFileWriter::WriteVector(const std::vector<bool> &v)
{
@@ -603,8 +603,8 @@
&& ray->first == master_rays[ray->index_hint])
ray_indicator[ray->index_hint] = true;
else {
---- ./code/latte/Residue.cpp.orig 2014-01-10 15:12:34.000000000 -0700
-+++ ./code/latte/Residue.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/Residue.cpp.orig 2014-10-09 15:51:49.000000000 -0600
++++ ./code/latte/Residue.cpp 2015-05-03 12:34:07.344361002 -0600
@@ -611,7 +611,7 @@ Residue_Single_Cone(listCone* cones, int
dim=numOfVars;
noGsPerC=lengthListVector(cones->rays);
@@ -614,8 +614,8 @@
vector<int> E(noCones); // E is the vector of epsilons, each 1 or -1
vector<list<Integer> > A(noCones); // A is the numerator vectors
---- ./code/latte/top-knapsack/TopKnapsack.cpp.orig 2014-01-26 13:54:56.000000000 -0700
-+++ ./code/latte/top-knapsack/TopKnapsack.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/top-knapsack/TopKnapsack.cpp.orig 2015-04-21 11:14:15.000000000 -0600
++++ ./code/latte/top-knapsack/TopKnapsack.cpp 2015-05-03 12:34:07.345360916 -0600
@@ -37,7 +37,7 @@ MobiusList::~MobiusList() {}
void MobiusList::insertGCD(const ZZ& v )
{
@@ -643,33 +643,6 @@
THROW_LATTE(LattException::bug_Unknown);
return B[i];
-@@ -305,8 +305,8 @@ void TopKnapsack::packageAnswer()
-
- ZZ hFactorial;
- hFactorial = 1;
-- for(int i = 2; i <= h; ++i)
-- hFactorial *= i;
-+ for(int j = 2; j <= h; ++j)
-+ hFactorial *= j;
-
- RationalNTL factor;
- if ( h % 2 == 0)
-@@ -838,11 +838,11 @@ void TopKnapsack::findResidue(GeneralMon
-
- vector<RationalNTL> fractionalPart;
- fractionalPart.resize(I);
-- for(int i = 0; i < I; ++i)
-+ for(int j = 0; j < I; ++j)
- {
-- fractionalPart[i] = RationalNTL(temp[i], invBd*coneRaysInvD);
-- if (fractionalPart[i].getDenominator() == 1)
-- fractionalPart[i] = 0; //fractionalPart(integer) = 0
-+ fractionalPart[j] = RationalNTL(temp[j], invBd*coneRaysInvD);
-+ if (fractionalPart[j].getDenominator() == 1)
-+ fractionalPart[j] = 0; //fractionalPart(integer) = 0
- }
-
- //now, fractionalPart[i] = {-B^-1 T s}_i
@@ -1278,7 +1278,7 @@ void TopKnapsack::everyGCDFromEntireList
{
//at the end of this i-loop, output will contain every gcd from subsets of {alpha[0], ..., alpha[i]}
@@ -679,8 +652,8 @@
{
ZZ g;
g = GCD(output[j], alpha[i]);
---- ./code/latte/triangulation/TriangulationWithTOPCOM.cpp.orig 2010-08-24 15:11:02.000000000 -0600
-+++ ./code/latte/triangulation/TriangulationWithTOPCOM.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/triangulation/TriangulationWithTOPCOM.cpp.orig 2014-10-09 15:49:47.000000000 -0600
++++ ./code/latte/triangulation/TriangulationWithTOPCOM.cpp 2015-05-03 12:34:07.346360830 -0600
@@ -124,7 +124,6 @@ read_TOPCOM_triangulation(istream &in,
char c;
// Find and consume left brace of triangulation.
@@ -689,8 +662,8 @@
do {
// Consume left brace of simplex.
in.get(c);
---- ./code/latte/valuation/PolytopeValuation.cpp.orig 2014-01-10 15:12:21.000000000 -0700
-+++ ./code/latte/valuation/PolytopeValuation.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/valuation/PolytopeValuation.cpp.orig 2015-04-21 11:07:20.000000000 -0600
++++ ./code/latte/valuation/PolytopeValuation.cpp 2015-05-03 12:34:07.346360830 -0600
@@ -537,7 +537,7 @@ RationalNTL PolytopeValuation::findInteg
//dilate the integrand..
@@ -734,8 +707,8 @@
vec_ZZ vert = vec_ZZ();
ZZ temp = ZZ();
mat_ZZ mat;
---- ./code/latte/valuation/RecursivePolytopeValuation.cpp.orig 2011-06-24 20:39:28.000000000 -0600
-+++ ./code/latte/valuation/RecursivePolytopeValuation.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/valuation/RecursivePolytopeValuation.cpp.orig 2014-10-09 15:51:19.000000000 -0600
++++ ./code/latte/valuation/RecursivePolytopeValuation.cpp 2015-05-03 12:34:07.347360744 -0600
@@ -25,7 +25,7 @@ RationalNTL RecursivePolytopeValuation::
RationalNTL ans;
@@ -745,8 +718,8 @@
vec_ZZ exp;
exp.SetLength(parm->Number_of_Variables);
for(int i = 0; i < parm->Number_of_Variables; ++i)
---- ./code/latte/valuation/valuation.cpp.orig 2014-01-10 15:12:20.000000000 -0700
-+++ ./code/latte/valuation/valuation.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/valuation/valuation.cpp.orig 2015-04-21 11:50:47.000000000 -0600
++++ ./code/latte/valuation/valuation.cpp 2015-05-03 12:34:07.347360744 -0600
@@ -366,7 +366,7 @@ void Valuation::computeTopEhrhart(Polyhe
}//computeTopEhrhart
@@ -796,7 +769,7 @@
strcpy(read_polyhedron_data.dualApproach, "yes");
strcpy(read_polyhedron_data.rationalCone, "yes");
} else if (strncmp(argv[i], "--ehrhart-taylor=", 17) == 0)
-@@ -739,8 +734,6 @@ Valuation::ValuationContainer Valuation:
+@@ -740,8 +735,6 @@ Valuation::ValuationContainer Valuation:
strcpy(read_polyhedron_data.Memory_Save, "no");
if (read_polyhedron_data.rationalCone[0] == 'y')
strcpy(read_polyhedron_data.Memory_Save, "no");
@@ -805,8 +778,8 @@
if (read_polyhedron_data.rationalCone[0] == 'y')
{
---- ./code/latte/valuation/valuation.h.orig 2013-12-21 13:51:56.000000000 -0700
-+++ ./code/latte/valuation/valuation.h 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/valuation/valuation.h.orig 2014-10-09 15:51:19.000000000 -0600
++++ ./code/latte/valuation/valuation.h 2015-05-03 12:34:07.347360744 -0600
@@ -188,8 +188,6 @@ ValuationContainer mainValuationDriver(c
void polyhedronToCones(const IntegrationInput &intInput, Polyhedron *Poly, BarvinokParameters * params);
@@ -816,8 +789,8 @@
}//namespace Valuation
---- ./code/latte/VertexConesWith4ti2.cpp.orig 2010-08-24 15:11:29.000000000 -0600
-+++ ./code/latte/VertexConesWith4ti2.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/VertexConesWith4ti2.cpp.orig 2014-10-09 15:51:49.000000000 -0600
++++ ./code/latte/VertexConesWith4ti2.cpp 2015-05-03 12:34:07.348360657 -0600
@@ -40,7 +40,6 @@ computeVertexConesWith4ti2(listVector* i
ConeConsumer &consumer)
{
@@ -826,8 +799,8 @@
int num_ineqs = lengthListVector(ineqs);
/* Create a matrix from the facets, with extra coordinates
at the front for slack variables. The 1 is related to the fact
---- ./code/latte/vertices/cdd.cpp.orig 2013-09-29 13:01:52.000000000 -0600
-+++ ./code/latte/vertices/cdd.cpp 2014-02-10 07:00:00.000000000 -0700
+--- ./code/latte/vertices/cdd.cpp.orig 2014-10-09 15:50:38.000000000 -0600
++++ ./code/latte/vertices/cdd.cpp 2015-05-03 12:34:07.348360657 -0600
@@ -174,7 +174,7 @@ void createCddIneFile(const dd_MatrixPtr
if ( stack.size())
{
diff --git a/latte-integrale.spec b/latte-integrale.spec
index 1a4ead7..6aae0a6 100644
--- a/latte-integrale.spec
+++ b/latte-integrale.spec
@@ -1,11 +1,9 @@
-%global fortiver 1.6.2
-%global fortirel 9
-%global lattever 1.7.2
-%global latterel 3
+%global fortiver 1.6.3
+%global lattever 1.7.3
Name: latte-integrale
Version: %{lattever}
-Release: %{latterel}%{?dist}.1
+Release: 1%{?dist}
Summary: Lattice point enumeration
License: GPLv2+
@@ -41,9 +39,8 @@ functions over polytopes and in particular to do volume computations.
%package -n 4ti2
Version: %{fortiver}
-Release: %{fortirel}%{?dist}.1
Summary: A software package for problems on linear spaces
-Requires: 4ti2-libs%{?_isa} = %{fortiver}-%{fortirel}%{?dist}
+Requires: 4ti2-libs%{?_isa} = %{fortiver}-%{release}
Requires: environment-modules
%description -n 4ti2
@@ -55,9 +52,8 @@ your PATH you will need to run module load 4ti2-x86_64
%package -n 4ti2-devel
Version: %{fortiver}
-Release: %{fortirel}%{?dist}.1
Summary: Headers needed to develop software that uses 4ti2
-Requires: 4ti2-libs%{?_isa} = %{fortiver}-%{fortirel}%{?dist}
+Requires: 4ti2-libs%{?_isa} = %{fortiver}-%{release}
Requires: gmp-devel%{?_isa}
%description -n 4ti2-devel
@@ -65,7 +61,6 @@ Headers and library files needed to develop software that uses 4ti2.
%package -n 4ti2-libs
Version: %{fortiver}
-Release: %{fortirel}%{?dist}.1
Summary: Library files for programs that use 4ti2
%description -n 4ti2-libs
@@ -223,6 +218,9 @@ make check
%{_libdir}/libzsolve*.so.*
%changelog
+* Sat May 9 2015 Jerry James <loganjerry at gmail.com> - 1.7.3-1
+- New upstream release
+
* Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 1.7.2-3.1
- Rebuilt for GCC 5 C++11 ABI change
diff --git a/sources b/sources
index 72af6a9..c925522 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7831ed5decc343da4465ff4dc7732ef7 latte-integrale-1.7.2.tar.gz
+7f2ae1012659d5ef1846aa28ddee5c3f latte-integrale-1.7.3.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/latte-integrale.git/commit/?h=master&id=2119b92ffefe24b5db1e068fca4b3c2393a97103
More information about the scm-commits
mailing list