ソースを参照

corrected Makefile and get-vectors after merging binaries

Piotr Bojanowski 9 年 前
コミット
3195af6059
2 ファイル変更5 行追加9 行削除
  1. 2 6
      Makefile
  2. 3 3
      get-vectors.sh

+ 2 - 6
Makefile

@@ -12,7 +12,7 @@ CFLAGS = -pthread -O3 -funroll-loops -std=c++0x
 OBJS = args.o dictionary.o matrix.o vector.o model.o utils.o
 INCLUDES = -I.
 
-all: fasttext print-vectors classify
+all: fasttext 
 
 args.o: src/args.cc src/args.h
 	$(CC) $(CFLAGS) -c src/args.cc
@@ -34,10 +34,6 @@ utils.o: src/utils.cc src/utils.h
 
 fasttext : $(OBJS) src/fasttext.cc
 	$(CC) $(CFLAGS) $(OBJS) src/fasttext.cc -o fasttext
-print-vectors : $(OBJS) src/print-vectors.cc
-	$(CC) $(CFLAGS) $(OBJS) src/print-vectors.cc -o print-vectors
-classify : $(OBJS) src/classify.cc
-	$(CC) $(CFLAGS) $(OBJS) src/classify.cc -o classify
 
 clean:
-	rm -rf *.o fasttext print-vectors classify
+	rm -rf *.o fasttext 

+ 3 - 3
get-vectors.sh

@@ -21,13 +21,13 @@ DATADIR=data
 
 mkdir -p "${RESULTDIR}"
 
-./fasttext -input "${DATADIR}"/text9 -output "${RESULTDIR}"/text9 -lr 0.025 -dim 300 \
-  -ws 5 -epoch 1 -minCount 5 -neg 5 -sampling sqrt -loss ns -model sg \
+./fasttext skipgram -input "${DATADIR}"/text9 -output "${RESULTDIR}"/text9 -lr 0.025 -dim 300 \
+  -ws 5 -epoch 1 -minCount 5 -neg 5 -sampling sqrt -loss ns \
   -bucket 2000000 -minn 3 -maxn 6 -onlyWord 0 -thread 8 -verbose 1000 \
   -t 1e-4
 
 cut -f 1,2 "${DATADIR}"/rw/rw.txt | awk '{print tolower($0)}' | tr '\t' '\n' > "${DATADIR}"/queries.txt
 
-cat "${DATADIR}"/queries.txt | ./print-vectors "${RESULTDIR}"/text9.bin > "${RESULTDIR}"/vectors.txt
+cat "${DATADIR}"/queries.txt | ./fasttext print-vectors "${RESULTDIR}"/text9.bin > "${RESULTDIR}"/vectors.txt
 
 python eval.py -m "${RESULTDIR}"/vectors.txt -d "${DATADIR}"/rw/rw.txt