CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
-OPTIMISE= -O2
-CFLAGS= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
+OPTIMISE= -O3
+CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
+CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
LIBGSL= -lgsl -lgslcblas
compute: all
$(MAKE) best-33.CFM
- $(MAKE) best-968.CFM
+ $(MAKE) best-64.CFM
+# $(MAKE) best-968.CFM
minimise: energy.o graph.o common.o mgraph.o minimise.o half.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
nprocessors: nprocessors.o common.o
- $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+ $(CC) $(CFLAGS_UNIPROC) -o $@ $^ $(LIBGSL)
+
+common.o nprocessors.o: %.o: %.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS_UNIPROC) $< -o $@
+
+.nprocessors.make: ./nprocessors
+ set -e; n=`./nprocessors`; \
+ echo "NPROCCFLAGS := -DNPROCESSORS=$$n" $o
+
+include .nprocessors.make
+
prime.data: primer
./$^ $o
-
sgtatham.cfm: sgtatham-regenerator prime.data $(SGTATHAM)/z.typescript
./$^ -T -o$@
ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
./$^ -o$@
-
best-33.CFM:
./minimise-33 sgtatham.cfm -iwip-33.cfm -o$@
interpolate-%: interpolate+%.o mgraph+%.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
-minimise-%: energy+%.o graph+%.o mgraph+%.o minimise+%.o half+%.o common.o
- $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+minimise-%: energy+%.o graph+%.o mgraph+%.o minimise+%.o \
+ half+%.o parallel.o common.o
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL) -lpthread
# this ridiculous repetition is due to make being too lame