software/meankondo
1
Fork 0
Code Issues Pull Requests Releases Activity

Support MPFR floats in numkondo

Browse Source 
Remove '-D' option (error tolerance) in numkondo
This commit is contained in:
Ian Jauslin
2015-10-07 12:51:41 +00:00
parent e7aa6859f0
commit 469bdc8071
34 changed files with 890 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -18,7 +18,7 @@
# if static=1 then link libkondo statically but other libraries dynamically
STATIC=1
VERSION=1.3.1
VERSION=1.4
# products of the compilation
PROJECT_BINS= meankondo numkondo meantools kondo_preprocess meantools-convert
@ -62,9 +62,9 @@ SRCDIR=./src
OBJDIR=./objs
# objects
LIBKONDO_OBJS = $(addprefix $(OBJDIR)/,array.o cli_parser.o coefficient.o fields.o grouped_polynomial.o idtable.o istring.o number.o parse_file.o polynomial.o rational_float.o rational_int.o rcc.o tools.o)
LIBKONDO_OBJS = $(addprefix $(OBJDIR)/,array.o cli_parser.o coefficient.o fields.o grouped_polynomial.o idtable.o istring.o number.o parse_file.o polynomial.o rational_float.o rational_int.o rcc.o rcc_mpfr.o tools.o)
MEANKONDO_OBJS = $(addprefix $(OBJDIR)/,meankondo.o mean.o)
NUMKONDO_OBJS = $(addprefix $(OBJDIR)/,numkondo.o flow.o)
NUMKONDO_OBJS = $(addprefix $(OBJDIR)/,numkondo.o flow.o flow_mpfr.o)
MEANTOOLS_OBJS = $(addprefix $(OBJDIR)/,meantools.o meantools_exp.o meantools_deriv.o meantools_eval.o)
KONDO_PP_OBJS = $(addprefix $(OBJDIR)/,kondo_preprocess.o kondo.o)
@ -78,8 +78,8 @@ XTRA_LIBS=
ifeq ($(STATIC),1)
# compile libkondo.a
PREREQ=static
# libkondo is linked against libm
XTRA_LIBS=-lm
# libkondo is linked against libm, libmpfr and libgmp
XTRA_LIBS=-lm -lmpfr -lgmp
# link binaries using the static library
LIBKONDO_FLAG=-l:libkondo.a
# install static lib
@ -87,8 +87,8 @@ ifeq ($(STATIC),1)
else ifeq ($(STATIC),2)
# compile libkondo.a
PREREQ=static
# libkondo is linked against libm
XTRA_LIBS=-lm
# libkondo is linked against libm, libmpfr and libgmp
XTRA_LIBS=-lm -lmpfr -lgmp
# link binaries statically
override LDFLAGS += -static
INSTALLLIB=install-static
@ -119,17 +119,17 @@ libkondo.a: $(LIBKONDO_OBJS)
$(AR) -rc $(BUILDDIR)/lib/$@ $^
libkondo.so.$(VERSION): $(LIBKONDO_OBJS)
$(LD) -shared -lm $(LDFLAGS) -o $(BUILDDIR)/lib/$@ $^
$(LD) -shared -lm -lmpfr -lgmp $(LDFLAGS) -o $(BUILDDIR)/lib/$@ $^
ln -fs ./libkondo.so.$(VERSION) $(BUILDDIR)/lib/libkondo.so
meankondo: $(MEANKONDO_OBJS)
$(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lpthread $(XTRA_LIBS)
numkondo: $(NUMKONDO_OBJS)
$(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lm $(XTRA_LIBS)
$(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lm -lmpfr -lgmp $(XTRA_LIBS)
meantools: $(MEANTOOLS_OBJS)
$(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) $(XTRA_LIBS)
$(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lmpfr -lgmp $(XTRA_LIBS)
meantools-convert:
cp scripts/meantools-convert $(BUILDDIR)/bin/