Sync everything up.

commonsense · Oct 24, 2011 · 3f6145a · 3f6145a
1 parent 6b1413a
commit 3f6145a
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 186 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,7 +16,6 @@
 [submodule "simplenlp"]
 	path = simplenlp
 	url = git://github.com/commonsense/simplenlp.git
-
-[submodule "luminoso2"]
-	path = luminoso2
+[submodule "luminoso"]
+	path = luminoso
 	url = ../luminoso
diff --git a/analytic_blending.py b/analytic_blending.py
diff --git a/conceptnet b/conceptnet
diff --git a/divisi2 b/divisi2
diff --git a/docs/index.rst b/docs/index.rst
@@ -22,7 +22,6 @@ Contents:
    conceptnet/index
    csc-utils/index
    developers/index
-   luminoso2/index
    divisi1/index
 
 Indices

diff --git a/docs/luminoso2 b/docs/luminoso2
diff --git a/luminoso b/luminoso
diff --git a/luminoso2 b/luminoso2
diff --git a/streaming_svd.py b/streaming_svd.py
+16 −0		conceptnet/corpus/migrations/0001_initial.py
+3 −2		conceptnet/corpus/models.py
+1 −1		conceptnet/models.py
+1 −1		conceptnet/network.py
+17 −8		maint/update_scores.py
+1 −1		setup.py
+3 −3		tools/dump_to_sqlite.py
+3 −3		tools/make_sqlite.py
+1 −0		divisi2/algorithms/__init__.py
+38 −0		divisi2/algorithms/randomized_svd.py
+12 −9		divisi2/algorithms/svd.py
+36 −0		divisi2/blending.py
+0 −2		divisi2/dense.py
+85 −9		divisi2/test/test_svd.py
+1 −0		svdlib/.gitattributes
+3,454 −1,452		svdlib/_svdlib.c
+166 −18		svdlib/_svdlib.pyx
+24 −24		svdlib/las2.c
+77 −29		svdlib/svdlib.c
+31 −7		svdlib/svdlib.h
+79 −16		svdlib/svdutil.c
+11 −6		svdlib/svdutil.h
+2 −2		svdlib/svdwrapper.c