reorganize script folders: more reasonable packaging

cmake/GtsamCythonWrap.cmake

@@ -1,7 +1,7 @@
 # Set up cache options
 set(GTSAM_CYTHON_INSTALL_PATH "" CACHE PATH "Cython toolbox destination, blank defaults to CMAKE_INSTALL_PREFIX/gtsam_cython")
 if(NOT GTSAM_CYTHON_INSTALL_PATH)
-	set(GTSAM_CYTHON_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/gtsam_cython")
+	set(GTSAM_CYTHON_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/cython")
 endif()
 
 # User-friendly Cython wrapping and installing function.  
@@ -70,7 +70,6 @@ function(install_cython_wrapped_library interface_header generated_files_path in
     # NOTE: only installs .pxd and .pyx and binary files (not .cpp) - the trailing slash on the directory name
 	# here prevents creating the top-level module name directory in the destination.
 	message(STATUS "Installing Cython Toolbox to ${install_path}") #${GTSAM_CYTHON_INSTALL_PATH}")
-	message(generated_files_path: "${generated_files_path}")
 	if(GTSAM_BUILD_TYPE_POSTFIXES)
 		foreach(build_type ${CMAKE_CONFIGURATION_TYPES})
 			string(TOUPPER "${build_type}" build_type_upper)

cython/CMakeLists.txt

@@ -1,4 +1,4 @@
 # Install cython components
 include(GtsamCythonWrap)
 # install scripts and tests
-install_cython_scripts("${CMAKE_SOURCE_DIR}/cython/" "*.py")
+install_cython_scripts("${CMAKE_SOURCE_DIR}/cython/gtsam" "*.py")

cython/gtsam/tests/experiments.py

@@ -5,7 +5,7 @@ won't be discovered.
 """
 from gtsam.gtsam import *
 import numpy as np
-from gtsam_utils import Vector, Matrix
+from gtsam.utils import Vector, Matrix
 
 r = Rot3()
 print(r)

cython/gtsam/tests/test_JacobianFactor.py

@@ -2,7 +2,7 @@ import unittest
 from gtsam import *
 from math import *
 import numpy as np
-from gtsam_utils import Matrix, Vector
+from gtsam.utils import Matrix, Vector
 
 class TestJacobianFactor(unittest.TestCase):
 

cython/gtsam/tests/test_LocalizationExample.py

@@ -1,6 +1,6 @@
 import unittest
 from gtsam import *
-from gtsam_utils import *
+from gtsam.utils import *
 from math import *
 import numpy as np
 

cython/gtsam/tests/test_Pose3SLAMExample.py

@@ -2,7 +2,7 @@ import unittest
 from gtsam import *
 from math import *
 import numpy as np
-from gtsam_utils.circlePose3 import * 
+from gtsam.utils.circlePose3 import * 
 
 class TestPose3SLAMExample(unittest.TestCase):
 

cython/gtsam/tests/test_SFMExample.py

@@ -2,8 +2,8 @@ import unittest
 from gtsam import *
 from math import *
 import numpy as np
-from gtsam_utils import Vector, Matrix
+from gtsam.utils import Vector, Matrix
-import gtsam_utils.visual_data_generator as generator
+import gtsam.utils.visual_data_generator as generator
 
 
 class TestSFMExample(unittest.TestCase):

cython/gtsam/tests/test_StereoVOExample.py

@@ -2,7 +2,7 @@ import unittest
 from gtsam import *
 from math import *
 import numpy as np
-from gtsam_utils import Vector, Matrix
+from gtsam.utils import Vector, Matrix
 
 
 class TestStereoVOExample(unittest.TestCase):

cython/gtsam/tests/test_VisualISAMExample.py

@@ -2,9 +2,9 @@ import unittest
 from gtsam import *
 from math import *
 import numpy as np
-from gtsam_utils import Vector, Matrix
+from gtsam.utils import Vector, Matrix
-import gtsam_utils.visual_data_generator as generator
+import gtsam.utils.visual_data_generator as generator
-import gtsam_utils.visual_isam as visual_isam
+import gtsam.utils.visual_isam as visual_isam
 
 class TestVisualISAMExample(unittest.TestCase):