From 659b7366db57f4b3f58a6d4c16bd4e9506707e44 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sep 25 2019 14:24:21 +0000 Subject: ntl-11.4.0. --- diff --git a/ntl-loadtime-cpu.patch b/ntl-loadtime-cpu.patch index b5bf12f..481d8fd 100644 --- a/ntl-loadtime-cpu.patch +++ b/ntl-loadtime-cpu.patch @@ -1,5 +1,5 @@ ---- doc/config.txt.orig 2018-08-17 12:24:27.000000000 -0600 -+++ doc/config.txt 2018-10-08 15:09:32.776186425 -0600 +--- doc/config.txt.orig 2019-09-24 18:24:43.000000000 -0600 ++++ doc/config.txt 2019-09-25 08:03:14.097990133 -0600 @@ -397,6 +397,7 @@ NTL_AVOID_BRANCHING=off NTL_GF2X_NOINLINE=off NTL_GF2X_ALTCODE=off @@ -8,7 +8,7 @@ GMP_INCDIR=$(GMP_PREFIX)/include GMP_LIBDIR=$(GMP_PREFIX)/lib -@@ -710,6 +711,10 @@ NTL_GF2X_ALTCODE1=off +@@ -711,6 +712,10 @@ NTL_GF2X_ALTCODE1=off # Yet another alternative implementation for GF2X multiplication. @@ -19,8 +19,8 @@ ########## More GMP Options: ---- include/NTL/config.h.orig 2018-08-17 12:24:27.000000000 -0600 -+++ include/NTL/config.h 2018-10-09 08:28:16.464126340 -0600 +--- include/NTL/config.h.orig 2019-09-24 18:24:43.000000000 -0600 ++++ include/NTL/config.h 2019-09-25 08:03:14.124989623 -0600 @@ -513,6 +513,19 @@ to be defined. Of course, to unset a f #endif @@ -41,8 +41,8 @@ /* sanity checks */ ---- include/NTL/ctools.h.orig 2018-08-17 12:24:27.000000000 -0600 -+++ include/NTL/ctools.h 2018-10-09 08:28:52.785432464 -0600 +--- include/NTL/ctools.h.orig 2019-09-24 18:24:42.000000000 -0600 ++++ include/NTL/ctools.h 2019-09-25 08:03:14.141989302 -0600 @@ -518,6 +518,155 @@ char *_ntl_make_aligned(char *p, long al // this should be big enough to satisfy any SIMD instructions, // and it should also be as big as a cache line @@ -199,8 +199,8 @@ #ifdef NTL_HAVE_BUILTIN_CLZL ---- include/NTL/MatPrime.h.orig 2018-08-17 12:24:27.000000000 -0600 -+++ include/NTL/MatPrime.h 2018-10-08 15:13:01.606492380 -0600 +--- include/NTL/MatPrime.h.orig 2019-09-24 18:24:43.000000000 -0600 ++++ include/NTL/MatPrime.h 2019-09-25 08:03:14.142989283 -0600 @@ -20,7 +20,7 @@ NTL_OPEN_NNS @@ -210,8 +210,8 @@ #define NTL_MatPrime_NBITS (23) #else #define NTL_MatPrime_NBITS NTL_SP_NBITS ---- include/NTL/REPORT_ALL_FEATURES.h.orig 2018-08-17 12:24:27.000000000 -0600 -+++ include/NTL/REPORT_ALL_FEATURES.h 2018-10-08 15:13:35.838865507 -0600 +--- include/NTL/REPORT_ALL_FEATURES.h.orig 2019-09-24 18:24:43.000000000 -0600 ++++ include/NTL/REPORT_ALL_FEATURES.h 2019-09-25 08:03:14.142989283 -0600 @@ -55,3 +55,6 @@ std::cerr << "NTL_HAVE_POSIX_TIME\n"; #endif @@ -219,8 +219,8 @@ +#ifdef NTL_LOADTIME_CPU + std::cerr << "NTL_LOADTIME_CPU\n"; +#endif ---- src/cfile.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/cfile 2018-10-09 08:29:19.248926910 -0600 +--- src/cfile.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/cfile 2019-09-25 08:03:14.142989283 -0600 @@ -513,6 +513,19 @@ to be defined. Of course, to unset a f #endif @@ -241,8 +241,8 @@ /* sanity checks */ ---- src/DispSettings.cpp.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/DispSettings.cpp 2018-10-09 08:29:37.247583069 -0600 +--- src/DispSettings.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/DispSettings.cpp 2019-09-25 08:03:14.143989264 -0600 @@ -187,6 +187,9 @@ cout << "Performance Options:\n"; cout << "NTL_GF2X_NOINLINE\n"; #endif @@ -253,8 +253,8 @@ cout << "***************************/\n"; cout << "\n\n"; ---- src/DoConfig.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/DoConfig 2018-10-09 08:30:06.200029962 -0600 +--- src/DoConfig.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/DoConfig 2019-09-25 08:03:14.143989264 -0600 @@ -1,6 +1,7 @@ # This is a perl script, invoked from a shell @@ -286,8 +286,8 @@ # some special MakeVal values that are determined by SHARED ---- src/GF2EX.cpp.orig 2018-08-17 12:24:26.000000000 -0600 -+++ src/GF2EX.cpp 2018-10-08 16:30:16.185776322 -0600 +--- src/GF2EX.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/GF2EX.cpp 2019-09-25 08:03:14.144989246 -0600 @@ -771,7 +771,7 @@ void mul(GF2EX& c, const GF2EX& a, const if (GF2E::WordLength() <= 1) use_kron_mul = true; @@ -297,8 +297,8 @@ // With gf2x library and pclmul, KronMul is better in a larger range, but // it is very hard to characterize that range. The following is very // conservative. ---- src/GF2X1.cpp.orig 2018-08-17 12:24:26.000000000 -0600 -+++ src/GF2X1.cpp 2018-10-08 15:17:28.540246907 -0600 +--- src/GF2X1.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/GF2X1.cpp 2019-09-25 08:03:14.145989227 -0600 @@ -18,7 +18,7 @@ // simple scaling factor for some crossover points: // we use a lower crossover of the underlying multiplication @@ -308,8 +308,8 @@ #define XOVER_SCALE (1L) #else #define XOVER_SCALE (2L) ---- src/GF2X.cpp.orig 2018-08-17 12:24:26.000000000 -0600 -+++ src/GF2X.cpp 2018-10-09 08:31:10.814795569 -0600 +--- src/GF2X.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/GF2X.cpp 2019-09-25 08:03:14.146989208 -0600 @@ -27,6 +27,22 @@ pclmul_mul1 (unsigned long *c, unsigned _mm_storeu_si128((__m128i*)c, _mm_clmulepi64_si128(aa, bb, 0)); } @@ -652,8 +652,8 @@ void LeftShift(GF2X& c, const GF2X& a, long n) ---- src/InitSettings.cpp.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/InitSettings.cpp 2018-10-08 15:31:06.504619910 -0600 +--- src/InitSettings.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/InitSettings.cpp 2019-09-25 08:03:14.147989189 -0600 @@ -184,6 +184,11 @@ int main() cout << "NTL_RANGE_CHECK=0\n"; #endif @@ -666,8 +666,8 @@ // the following are not actual config flags, but help ---- src/mat_lzz_p.cpp.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/mat_lzz_p.cpp 2018-10-09 08:43:09.480066234 -0600 +--- src/mat_lzz_p.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/mat_lzz_p.cpp 2019-09-25 08:03:14.149989151 -0600 @@ -9,6 +9,15 @@ #ifdef NTL_HAVE_AVX @@ -1728,7 +1728,7 @@ static inline -@@ -8042,8 +8802,9 @@ long elim(const mat_zz_p& A, mat_zz_p *i +@@ -8057,8 +8817,9 @@ long elim(const mat_zz_p& A, mat_zz_p *i else { long V = 4*MAT_BLK_SZ; @@ -1740,8 +1740,8 @@ V <= (MAX_DBL_INT-(p-1))/(p-1) && V*(p-1) <= (MAX_DBL_INT-(p-1))/(p-1)) { ---- src/QuickTest.cpp.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/QuickTest.cpp 2018-10-08 16:15:39.290232803 -0600 +--- src/QuickTest.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/QuickTest.cpp 2019-09-25 08:03:14.149989151 -0600 @@ -324,6 +324,9 @@ cerr << "Performance Options:\n"; cerr << "NTL_GF2X_NOINLINE\n"; #endif @@ -1752,8 +1752,8 @@ cerr << "\n\n"; ---- src/WizardAux.orig 2018-08-17 12:24:27.000000000 -0600 -+++ src/WizardAux 2018-10-08 16:16:09.609702059 -0600 +--- src/WizardAux.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/WizardAux 2019-09-25 08:03:14.149989151 -0600 @@ -89,6 +89,7 @@ system("$ARGV[0] InitSettings"); 'NTL_GF2X_NOINLINE' => 0, 'NTL_FFT_BIGTAB' => 0, @@ -1762,8 +1762,8 @@ 'WIZARD_HACK' => '#define NTL_WIZARD_HACK', ---- src/ZZ.cpp.orig 2018-08-17 12:24:26.000000000 -0600 -+++ src/ZZ.cpp 2018-10-09 08:32:28.926303337 -0600 +--- src/ZZ.cpp.orig 2019-09-24 18:24:42.000000000 -0600 ++++ src/ZZ.cpp 2019-09-25 08:03:14.150989132 -0600 @@ -14,6 +14,13 @@ #elif defined(NTL_HAVE_SSSE3) #include diff --git a/ntl.spec b/ntl.spec index 64d2e88..3fa7b56 100644 --- a/ntl.spec +++ b/ntl.spec @@ -10,7 +10,7 @@ Summary: High-performance algorithms for vectors, matrices, and polynomials Name: ntl -Version: 11.3.4 +Version: 11.4.0 Release: 1%{?dist} License: LGPLv2+ @@ -132,7 +132,7 @@ done %files %doc README %license doc/copying.txt -%{_libdir}/libntl.so.41* +%{_libdir}/libntl.so.42* %files devel %doc doc/* @@ -146,6 +146,9 @@ done %changelog +* Wed Sep 25 2019 Jerry James - 11.4.0-1 +- ntl-11.4.0 + * Tue Sep 24 2019 Jerry James - 11.3.4-1 - ntl-11.3.4