Add a static build, version information

Author: magv

Makefile

@@ -2,10 +2,20 @@ XCXXFLAGS=${CXXFLAGS} \
 	  -std=c++14 -Os \
 	  -pedantic -Wall -Wno-deprecated-declarations -Wno-format
 
-XLDFLAGS=${LDFLAGS} -lflint -lgmp -lginac -lcln
+XCXXFLAGS_STATIC=${XCXXFLAGS} -Os -s -static -pthread
+
+XLDFLAGS=${LDFLAGS} -lflint -lmpfr -lgmp -lginac -lcln
+
+XLDFLAGS_STATIC=${XLDFLAGS}
 
 ratnormal: ratnormal.cpp Makefile
-	${CXX} ${XCXXFLAGS} -o $@ ratnormal.cpp ${XLDFLAGS}
+	@date "+static const char VERSION[] = \"Ratnormal $$(git --git-dir=.git rev-parse --short=12 HEAD), built on %Y-%m-%d\n\";" >version.h
+	${CXX} ${XCXXFLAGS} -include version.h -o $@ ratnormal.cpp ${XLDFLAGS}
+
+ratnormal.static: ratnormal.cpp Makefile mkversion.sh
+	env CXX="${CXX}" ./mkversion.sh >version.h
+	${CXX} ${XCXXFLAGS_STATIC} -include version.h -o $@ ratnormal.cpp ${XLDFLAGS_STATIC}
+	@upx --best "$@"
 
 README.md: ratnormal.cpp mkmanual.sh
 	sed '/MANUAL/{n;q}' $@ >$@.tmp

mkversion.sh

@@ -0,0 +1,54 @@
+hgid() {
+    tip=$(hg -R "$1" tip -T '{node}')
+    if [ $? -ne 0 ]; then return 1; fi
+    shortid=$(hg -R "$1" id -i)
+    date=$(hg -R "$1" log -T '{date|shortdate}' -r $tip)
+    echo "commit $shortid from $date"
+}
+
+gitid() {
+    cidlong=$(git --git-dir "$1/.git" describe --always --abbrev=0 --match '')
+    if [ $? -ne 0 ]; then return 1; fi
+    cidshort=$(git --git-dir "$1/.git" describe --always --abbrev=12 --match '' --dirty=+)
+    date=$(git --git-dir "$1/.git" log -1 $cidlong --date=format:'%Y-%m-%d' --format=format:'%cd')
+    echo "commit $cidshort from $date"
+}
+
+pkgid_rpm() {
+    info=$(rpm --queryformat="%{VERSION}-%{RELEASE}\n" -q "$1" 2>/dev/null)
+    if [ $? -ne 0 ]; then return 1; fi
+    printf "%s" "$info" | head -1
+}
+
+pkgid_dpkg() {
+    info=$(dpkg -s "$1" 2>/dev/null)
+    if [ $? -ne 0 ]; then return 1; fi
+    printf "%s" "$info" | sed -n '/Version: /{s/^.* //;p}'
+}
+
+pkgid() {
+    local pkg
+    for pkg in "$@"; do
+        pkgid_rpm "$pkg" && return
+        pkgid_dpkg "$pkg" && return
+    done
+    echo "unknown"
+}
+
+cat <<EOF
+static const char VERSION[] = R"(\
+Feynson, $(gitid . 2>/dev/null || hgid .)
+Libraries:
+  FLINT $(pkgid libflint-dev libflint flint)
+  MPFR $(pkgid libmpfr-dev libmpfr mpfr)
+  GiNaC $(pkgid libginac-dev libginac ginac)
+  CLN $(pkgid libcln-dev libcln cln)
+  GMP $(pkgid libgmp-dev libgmp gmp)
+  glibc $(pkgid glibc libc6)
+  libstdc++ $(pkgid libstdc++ libstdc++6)
+Compiler:
+  $(${CXX:-c++} --version | head -1)
+Compressor:
+  UPX $(pkgid upx upx-ucl)
+)";
+EOF

ratnormal.cpp

@@ -202,6 +202,20 @@ rat_fit_length(rat_t rat, ulong len)
     }
 }
 
+void
+rat_set(rat_t rat, const rat_t src)
+{
+    rat_one(rat);
+    fmpq_set(rat->numfactor, src->numfactor);
+    rat_fit_length(rat, src->num);
+    for (ulong i = 0; i < src->num; i++) {
+        fmpz_mpoly_init(&rat->factors[i], ctx);
+        fmpz_mpoly_set(&rat->factors[i], &src->factors[i], ctx);
+        rat->powers[i] = src->powers[i];
+    }
+    rat->num = src->num;
+}
+
 void
 rat_mul_fmpq(rat_t rat, const fmpq_t x, const int power)
 {
@@ -386,11 +400,8 @@ rat_cofactorize(rat_t rat)
 {
     LOGME;
     logd("Cofactorizing %r", rat);
-    rat_sort(rat);
-    fmpz_mpoly_t gcd, aprime, bprime;
+    fmpz_mpoly_t gcd;
     fmpz_mpoly_init(gcd, ctx);
-    fmpz_mpoly_init(aprime, ctx);
-    fmpz_mpoly_init(bprime, ctx);
     for (ulong i = 0; i < rat->num; i++) {
         #define A (&rat->factors[i])
         #define Apower rat->powers[i]
@@ -403,11 +414,9 @@ rat_cofactorize(rat_t rat)
             if (fmpz_mpoly_is_one(gcd, ctx)) {
                 continue;
             }
-            logd("Split factor: %p^%d from %p^%d %p^%d", gcd, Apower + Bpower, A, Apower, B, Bpower);
-            if (fmpz_mpoly_divides(aprime, A, gcd, ctx) != 1) { assert(0); }
-            if (fmpz_mpoly_divides(bprime, B, gcd, ctx) != 1) { assert(0); }
-            fmpz_mpoly_swap(A, aprime, ctx);
-            fmpz_mpoly_swap(B, bprime, ctx);
+            logd("Split factor %p^%d from %p^%d %p^%d", gcd, Apower + Bpower, A, Apower, B, Bpower);
+            if (fmpz_mpoly_divides(A, A, gcd, ctx) != 1) { assert(0); }
+            if (fmpz_mpoly_divides(B, B, gcd, ctx) != 1) { assert(0); }
             rat_mul_fmpz_mpoly_setx(rat, gcd, Apower + Bpower);
             if (fmpz_mpoly_is_fmpz(B, ctx)) {
                 rat_swapoff_fmpz_factor(rat, j);
@@ -425,9 +434,6 @@ rat_cofactorize(rat_t rat)
         #undef Apower
     }
     fmpz_mpoly_clear(gcd, ctx);
-    fmpz_mpoly_clear(aprime, ctx);
-    fmpz_mpoly_clear(bprime, ctx);
-    rat_sort(rat);
 }
 
 void
@@ -559,7 +565,9 @@ rat_add_setx(rat_t res, rat_t rat1, rat_t rat2)
     #undef Apower
     #undef B
     #undef Bpower
+    rat_sort(res);
     rat_cofactorize(res);
+    rat_sort(res);
     logd("Result is %r", res);
 }
 
@@ -655,24 +663,11 @@ ratsum_sum_setx(rat_t rat, ratsum_t sum)
         }
         assert((idx1 >= 0) && (idx2 >= 0) && (idx1 != idx2));
         logd("Adding pair %ld of %ld", n+1, sum->num-1);
-        //rat_set(tmp1, &sum->terms[idx1]);
-        //rat_set(tmp2, &sum->terms[idx2]);
         rat_add_setx(rat, &sum->terms[idx1], &sum->terms[idx2]);
-        /*
-        if (1) {
-            logd("Same pair, but with combined den");
-            rat_combine_denominators(tmp1);
-            rat_combine_denominators(tmp2);
-            rat_add_setx(tmp3, tmp1, tmp2);
-        }
-        */
         rat_swap(&sum->terms[idx1], rat);
         rat_swap(&sum->terms[idx2], &sum->terms[sum->num - n - 1]);
     }
     rat_swap(&sum->terms[0], rat);
-    //rat_clear(tmp1);
-    //rat_clear(tmp2);
-    //rat_clear(tmp3);
 }
 
 /* GiNaC conversion
@@ -791,7 +786,9 @@ ratsum_of_ginac(ratsum_t sum, const GiNaC::ex &expr)
         rat_t rat;
         rat_init(rat);
         rat_of_ginac(rat, term);
+        rat_sort(rat);
         rat_cofactorize(rat);
+        rat_sort(rat);
         ratsum_add_rat_setx(sum, rat);
         rat_clear(rat);
     });
@@ -940,10 +937,11 @@ main(int argc, char *argv[])
     int nthreads = 1;
     const char *inputfile = "-";
     const char *outputfile = "-";
-    for (int opt; (opt = getopt(argc, (char*const*)argv, "j:hC")) != -1;) {
+    for (int opt; (opt = getopt(argc, (char*const*)argv, "j:hCV")) != -1;) {
         switch (opt) {
         case 'j': nthreads = atoi(optarg); break;
         case 'h': usage(stdout); return 0;
+        case 'V': printf("%s", VERSION); return 0;
         case 'C': COLORS = true; break;
         default: return 1;
         }