Merge branch '64'

aritter · Nov 16, 2011 · 2a136ed · 2a136ed
2 parents b1f9317 + d95c92b
commit 2a136ed
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 4 deletions.
diff --git a/TinySVM-0.09.tar.gz b/TinySVM-0.09.tar.gz
diff --git a/build.sh b/build.sh
@@ -1,2 +1,7 @@
 cd hbc/models
-make
+gcc -O3 -lm labels.c stats.c samplib.c LabeledLDA_infer.c -o LabeledLDA_infer.out
+cd ../../
+tar xvzf TinySVM-0.09.tar.gz
+cd TinySVM-0.09
+./configure --prefix=`pwd`/../ && make && make install
+
diff --git a/hbc/models/LabeledLDA_infer.out b/hbc/models/LabeledLDA_infer.out
diff --git a/lib/libtinysvm.a b/lib/libtinysvm.a
diff --git a/lib/libtinysvm.la b/lib/libtinysvm.la
@@ -29,4 +29,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/aritter/local/lib'
+libdir='/homes/gws/aritter/twitter_nlp_release/TinySVM-0.09/..//lib'
diff --git a/lib/libtinysvm.so b/lib/libtinysvm.so
diff --git a/lib/libtinysvm.so b/lib/libtinysvm.so
@@ -0,0 +1 @@
+libtinysvm.so.1.2.0
diff --git a/lib/libtinysvm.so.1 b/lib/libtinysvm.so.1
diff --git a/lib/libtinysvm.so.1 b/lib/libtinysvm.so.1
@@ -0,0 +1 @@
+libtinysvm.so.1.2.0
diff --git a/lib/libtinysvm.so.1.2.0 b/lib/libtinysvm.so.1.2.0
diff --git a/python/cap/cap_classifier.pyc b/python/cap/cap_classifier.pyc
diff --git a/python/cap/cap_classify b/python/cap/cap_classify
diff --git a/python/ner/extractEntities2.py b/python/ner/extractEntities2.py
@@ -46,8 +46,8 @@ def GetLLda():
                            stdin=subprocess.PIPE,
                            stdout=subprocess.PIPE)
 
-if platform.architecture() != ('32bit', 'ELF'):
-    sys.exit("Requires 32 bit Linux")
+if platform.architecture() != ('64bit', 'ELF'):
+    sys.exit("Requires 64 bit Linux")
 
 parser = OptionParser()
 parser.add_option("--chunk", action="store_true", default=False)