chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempts to fix 125; really need to combine edge length variation and bending costs
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 9443d70dc9241974290d08ee973b243854564fba..50badd1e820b6ad7036b615e51648e0582700a02 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,9
+11,7
@@
SGTATHAM=sgtatham
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
-NPROCCFLAGS := -DNPROCESSORS=$(shell ./nprocessors)
-
-OPTIMISE= -O2
+OPTIMISE= -O3
CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
@@
-26,7
+24,8
@@
all: $(TARGETS)
compute: all
$(MAKE) best-33.CFM
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)
minimise: energy.o graph.o common.o mgraph.o minimise.o half.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
@@
-40,6
+39,13
@@
nprocessors: nprocessors.o common.o
common.o nprocessors.o: %.o: %.c
$(CC) -c $(CPPFLAGS) $(CFLAGS_UNIPROC) $< -o $@
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
prime.data: primer
./$^ $o