Merge branch 'master' into doc

Author: mohabsafey

.github/workflows/msolve.yml

@@ -32,10 +32,26 @@ jobs:
       - name: autogen
         run: ./autogen.sh
       - name: configure
-        run: ./configure
+        run: |
+               if [ "$RUNNER_OS" == "Linux" ]; then
+                    ./configure
+               elif [ "$RUNNER_OS" == "macOS" ]; then
+                    ./configure LDFLAGS="-L$(brew --prefix)/lib/" CFLAGS="-g -O2 -I$(brew --prefix)/include/"
+               else
+                    echo "$RUNNER_OS not supported"
+                    exit 1
+               fi
       - name: make
         run: make
       - name: make check
         run: make check
       - name: make distcheck
-        run: make distcheck
+        run: |
+               if [ "$RUNNER_OS" == "Linux" ]; then
+                    make distcheck
+               elif [ "$RUNNER_OS" == "macOS" ]; then
+                    make distcheck LDFLAGS="-L$(brew --prefix)/lib/" CFLAGS="-g -O2 -I$(brew --prefix)/include/"
+               else
+                    echo "$RUNNER_OS not supported"
+                    exit 1
+               fi

.gitignore

@@ -3,6 +3,8 @@
 *.so
 *.lo
 *.la
+*.log
+*.trs
 *~
 *.libs
 *.in
@@ -31,4 +33,5 @@ libtool
 ltmain.sh
 missing
 stamp-h1
+msolve.pc
 /msolve

INSTALL

@@ -4,26 +4,30 @@ You will need to have autotools installed on your system.
 1. Run `./autogen.sh` which generates configure and the Makefiles.
 2. Run `./configure` (possibly with options, see `./configure -h` for
    more information).
-3. Run make (possibly with CFLAGS and LDFLAGS adjusted).
-4. Run `make install` in order to globally install the library and the binary
+3. Run `make` (possibly with CFLAGS and LDFLAGS adjusted).
+4. Run `make check`.
+5. Run `make install` in order to globally install the library and the binary
    of msolve.
 
-If you are working on a distriubtion (downloaded *.tar.gz)
+If you are working on a distribution (downloaded *.tar.gz)
 ==========================================================
-1. Run ./configure (possibly with options, see ./configure -h for more
+1. Run `./configure` (possibly with options, see `./configure -help` for more
    information).
 2. Run `make` (possibly with CFLAGS and LDFLAGS adjusted).
-3. Run `make install` in order to globally install the library and the binary
+3. Run `make check`.
+4. Run `make install` in order to globally install the library and the binary
    of msolve.
 
 NOTE TO MAC OS users
 ====================
-You need to proceed slightly differently by modifying the `Makefile` file as follows
+To build a static binary file, you may need to run `./configure --enable-static`.
+
+You may also need to proceed slightly differently by modifying the `Makefile` file as follows
 - add to the `LIBS` variable the `-fopenmp` option
 ```
 LIBS = -lflint -lmpfr -lgmp -lm -fopenmp
 ```
-- change the `CC` variable to your actual `gcc` compiler 
+- change the `CC` variable to your actual `gcc` compiler, e.g.
 ```
 CC = gcc-11
 ```
@@ -35,4 +39,4 @@ Run `make dist`.
 
 If you want to generate a static binary
 =======================================
-Add `-all-static` to your LDFLAGS as follows `make LDFLAGS="all-static"`.
+Add `-all-static` to your LDFLAGS as follows `make LDFLAGS="-all-static"`.

Makefile.am

@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = color-tests
-SUBDIRS = src/usolve src/fglm src/neogb src/msolve/
-EXTRA_DIST         = $(srcdir)/test/input_files
+SUBDIRS = src/usolve src/fglm src/neogb src/msolve
 
 AM_CFLAGS	= $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS)
 LDADD 		= src/neogb/libneogb.la src/fglm/libfglm.la src/usolve/libusolve.la
@@ -11,12 +10,69 @@ msolve_SOURCES 	= src/msolve/main.c
 check_PROGRAMS		= neogb_io \
 			  fglm_build_matrixn_radical_shape-31 \
 			  fglm_build_matrixn_nonradical_shape-31 \
-			  fglm_build_matrixn_nonradical_radicalshape-31
+			  fglm_build_matrixn_nonradical_radicalshape-31 \
+			  line_endings_support
+
+checkdiff               = test/diff/diff_cp_d_3_n_4_p_2.sh \
+			  test/diff/diff_cyclic5-16.sh \
+			  test/diff/diff_cyclic5-31.sh \
+			  test/diff/diff_cyclic5-qq.sh \
+			  test/diff/diff_eco6-16.sh \
+			  test/diff/diff_eco6-31.sh \
+			  test/diff/diff_eco6-qq.sh \
+			  test/diff/diff_groebner-g2.sh \
+			  test/diff/diff_henrion5-qq.sh \
+			  test/diff/diff_eco10-31.sh \
+			  test/diff/diff_truncate_gb.sh \
+			  test/diff/diff_elim-31.sh \
+			  test/diff/diff_elim-qq.sh \
+			  test/diff/diff_F4SAT-31.sh \
+			  test/diff/diff_F4SAT-byone-31.sh \
+			  test/diff/diff_kat6-31.sh \
+			  test/diff/diff_kat7-qq.sh \
+			  test/diff/diff_multy-16.sh \
+			  test/diff/diff_multy-31.sh \
+			  test/diff/diff_multy-qq.sh \
+			  test/diff/diff_nonradical_shape-qq.sh \
+			  test/diff/diff_nonradical_radicalshape-qq.sh \
+			  test/diff/diff_nonradical_radicalshape-no-square-31.sh \
+			  test/diff/diff_nonradical_radicalshape-no-square-qq.sh \
+			  test/diff/diff_one-16.sh \
+			  test/diff/diff_one-31.sh \
+			  test/diff/diff_one-qq.sh \
+			  test/diff/diff_radical_shape-31.sh \
+			  test/diff/diff_radical_shape-qq.sh \
+			  test/diff/diff_realroot-extraction-exact-root.sh \
+			  test/diff/diff_reals_dim0.sh \
+			  test/diff/diff_realroot1.sh \
+			  test/diff/diff_reals_dim0-chgvar.sh \
+			  test/diff/diff_reals_dim0-extract.sh \
+			  test/diff/diff_reals_dim0-swapvar.sh \
+			  test/diff/diff_bug_empty_tracer.sh \
+			  test/diff/diff_bug_2nd_prime_bad.sh \
+			  test/diff/diff_bug_68.sh \
+			  test/diff/diff_mq_2_1.sh \
+			  test/diff/diff_xy-qq.sh \
+			  test/diff/diff_test-lifting2.sh \
+			  test/diff/diff_linear-qq.sh \
+			  test/diff/diff_input-overflow-16.sh \
+			  test/diff/diff_nf_8.sh \
+			  test/diff/diff_nf_16.sh \
+			  test/diff/diff_nf_31.sh \
+			  test/diff/diff_nf_lm_bug.sh \
+			  test/diff/diff_f4sat-field-char.sh \
+			  test/diff/diff_f4sat-zero-input.sh \
+			  test/diff/diff_f4sat-is-saturated-check.sh \
+			  test/diff/diff_maxbitsize-bug.sh
+
 # dist_check_DATA         = test/input_files
 neogb_io_SOURCES 	= test/neogb/io/validate_input_data.c
 fglm_build_matrixn_radical_shape_31_SOURCES = test/fglm/build_matrixn_radical_shape-31.c
 fglm_build_matrixn_nonradical_shape_31_SOURCES = test/fglm/build_matrixn_nonradical_shape-31.c
 fglm_build_matrixn_nonradical_radicalshape_31_SOURCES = test/fglm/build_matrixn_nonradical_radicalshape-31.c
+line_endings_support_SOURCES = test/msolve/line_endings_support.c
 
+TESTS = $(check_PROGRAMS) $(checkdiff)
 
-TESTS = $(check_PROGRAMS)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = msolve.pc

README.md

@@ -49,6 +49,10 @@ Polynomials may be multiline, thus `,` as a separator.
 
 Coefficients can be rational, using `/`, e.g. `-2/3*x2*y1^2+...`.
 
+In each polynomial, a single occurrence of each monomial is expected; the
+behaviour of msolve's parser is undefined if some monomial is repeated, as in
+`x1+x2+x3+x4-x1`.
+
 # Basic usage
 
 Some basic commands are as follows: