X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=build-book.sh;h=94f3a298ef6c655f7c296fe24d7b3f1b4da7c462;hb=74f1261e4067cbc1b743b329ed2d419aee735cbf;hp=1ed0b7771c2d8341737c78163b47486ff7977610;hpb=8f777b504b52cb15a09666b164343ae43ca5bfb5;p=remoteglot-book

diff --git a/build-book.sh b/build-book.sh
index 1ed0b77..94f3a29 100755
--- a/build-book.sh
+++ b/build-book.sh
@@ -2,30 +2,60 @@
 
 set -e
 
-SHARDS=40
+export MAPPERS=40
+export REDUCERS=40
+export SHARDS=40
 
-rm -f part-*.bin part-*.mtbl part-*.mtbl.part???? open.mtbl.new open.mtbl.part???? open.mtbl.part????.new 2>/dev/null
+rm -f pgnnames.txt tmp.mtbl* open.mtbl.part????.new 2>/dev/null
 
-for FILE in $@; do
-	date | tr -d "\n"
-	echo "  $FILE"
-	./parallel-parse-pgn.sh $FILE
+for FILE in "$@"; do
+	echo "$FILE" >> pgnnames.txt
 done
-date 
 
-for FILE in part-*.bin; do
-	( ./binloader $FILE ${FILE/bin/mtbl} $SHARDS ) &
+TS_BEGIN=$( date +%s%3N )
+
+for X in $( seq 0 $(( MAPPERS - 1 )) ); do
+	(
+		(
+			PGNNUM=0
+			for FILE in "$@"; do
+				COMP=0
+				if echo "$FILE" | grep -q ^comp:; then
+					COMP=1
+					FILE=$( echo "$FILE" | sed s/comp:// )
+				fi
+				START=$( ./find-pgn-split-point.sh "$FILE" $X $MAPPERS )
+				END=$( ./find-pgn-split-point.sh "$FILE" $(( X + 1 )) $MAPPERS )
+				~/nmu/pgn-extract/pgn-extract --computerflag $COMP --startpos $START --endpos $END --startfilenum $PGNNUM -e -Wsessebin "$FILE" 2>/dev/null
+				PGNNUM=$(( PGNNUM + 1 ))
+			done
+		) | ./binloader - tmp.mtbl.mapper$X $SHARDS 500000
+	) &
 done
 wait
 
-rm -f part-*.bin
+TS_MAPDONE=$( date +%s%3N )
+MAPOUTPUT=$( du -sch tmp.mtbl.mapper* | tail -n 1 | cut -f1 | sed 's/\([^0-9]\)$/ \1/' )
 
-for X in $( seq 0 $(( SHARDS - 1 )) ); do
-	( ./binmerger part-*.mtbl.part$( printf %04d $X ) open.mtbl.part$( printf %04d $X ).new ) &
-done
-wait
+echo "Reducing..."
+
+parallel -i -j $REDUCERS bash -c 'X={}; ./binmerger tmp.mtbl.mapper*.part$( printf %04d $X ).subshard* open.mtbl.part$( printf %04d $X ).new' -- $( seq 0 $(( SHARDS - 1 )) )
+
+TS_REDUCEDONE=$( date +%s%3N )
+REDUCEOUTPUT=$( du -sch open.mtbl.part*.new | tail -n 1 | cut -f1 | sed 's/\([^0-9]\)$/ \1/' )
 
 for X in $( seq 0 $(( SHARDS - 1 )) ); do
 	mv open.mtbl.part$( printf %04d $X ).new open.mtbl.part$( printf %04d $X )
 done
-rm -f part-*.mtbl.part????
+rm -f tmp.mtbl*
+
+TS_END=$( date +%s%3N )
+
+printf "\n"
+printf "  Map time:       %7d ms\n" $(( TS_MAPDONE - TS_BEGIN ))
+printf "  Reduce time:    %7d ms\n" $(( TS_REDUCEDONE - TS_MAPDONE ))
+printf "  Total time:     %7d ms\n" $(( TS_END - TS_BEGIN ))
+printf "\n"
+printf "  Map output:       %7sB\n" "$MAPOUTPUT"
+printf "  Reduce output:    %7sB\n" "$REDUCEOUTPUT"
+printf "\n"