Merge pull request #599 from insertinterestingnamehere/pydynd

Fully remove libpydynd

Author: insertinterestingnamehere

CMakeLists.txt

@@ -164,38 +164,6 @@ else()
     set(DYND_CUDA_01 0)
 endif()
 
-set(pydynd_SRC
-    dynd/include/conversions.hpp
-    dynd/include/copy_from_numpy_arrfunc.hpp
-    dynd/include/exception_translation.hpp
-    dynd/include/functional.hpp
-    dynd/include/git_version.hpp
-    dynd/include/init.hpp
-    dynd/include/type_functions.hpp
-    dynd/include/utility_functions.hpp
-    dynd/include/visibility.hpp
-    dynd/src/conversions.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/dynd/src/git_version.cpp
-    dynd/src/git_version.cpp.in
-)
-
-add_library(pydynd SHARED ${pydynd_SRC})
-set_property(
-   TARGET pydynd
-   PROPERTY COMPILE_DEFINITIONS PYDYND_EXPORT
-   )
-
-if(APPLE)
-    set_target_properties(pydynd PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-elseif(WIN32)
-    target_link_libraries(pydynd "${PYTHON_LIBRARIES}")
-endif()
-if(DYND_INSTALL_LIB)
-    target_link_libraries(pydynd "${LIBDYND_LIBRARIES}")
-else()
-    target_link_libraries(pydynd libdynd)
-endif()
-
 foreach(pyx_api_file dynd/nd/array.pyx dynd/nd/callable.pyx dynd/ndt/type.pyx)
     set_source_files_properties(${pyx_api_file} PROPERTIES CYTHON_API 1)
     set_source_files_properties(${pyx_api_file} PROPERTIES CYTHON_PUBLIC 1)
@@ -205,53 +173,68 @@ set_source_files_properties(dynd/config.pyx PROPERTIES CYTHON_API 1)
 
 cython_add_module(dynd.nd.array dynd.nd.array_pyx True
                   # Additional C++ source files:
-                  dynd/src/array_as_pep3118.cpp
-                  dynd/src/assign.cpp
                   dynd/include/do_import_array.hpp
                   dynd/include/numpy_interop.hpp
+                  dynd/src/array_as_pep3118.cpp
                   dynd/src/array_as_numpy.cpp
                   dynd/src/array_from_py.cpp
                   dynd/src/array_from_py_typededuction.cpp
+                  dynd/src/assign.cpp
+                  dynd/src/conversions.cpp
                   dynd/src/copy_from_numpy_arrfunc.cpp
                   dynd/src/init.cpp
                   dynd/src/functional.cpp
                   dynd/src/numpy_interop.cpp
                   dynd/src/types/pyobject_type.cpp
                   )
-set_property(
-   TARGET dynd.nd.array
-   PROPERTY COMPILE_DEFINITIONS PYDYND_EXPORT
-   )
 
-foreach(module dynd.config dynd.ndt.type dynd.ndt.json dynd.nd.callable dynd.nd.functional dynd.nd.registry)
-    cython_add_module(${module} ${module}_pyx True)
-endforeach(module)
-
-foreach(module dynd.config dynd.ndt.type dynd.ndt.json dynd.nd.array dynd.nd.callable dynd.nd.functional dynd.nd.registry)
-    # Make sure libpydynd is on the rpath.
-    # This has no effect on Windows.
-    if(APPLE)
-        set(module_install_rpath "@loader_path")
-    else()
-        set(module_install_rpath "$ORIGIN")
-    endif()
-    string(REPLACE "." ";" module_directories "${module}")
-    list(LENGTH module_directories i)
-    while(${i} GREATER 2)
-        set(module_install_rpath "${module_install_rpath}/..")
-        math(EXPR i "${i} - 1" )
-    endwhile(${i} GREATER 2)
-#    set(module_install_rpath "/opt/anaconda/envs/_test/lib/python2.7/site-packages/dynd/")
-    set_target_properties(${module} PROPERTIES INSTALL_RPATH ${module_install_rpath})
+cython_add_module(dynd.config dynd.config_pyx True
+                  dynd/include/exception_translation.hpp
+                  dynd/src/conversions.cpp
+                  ${CMAKE_CURRENT_BINARY_DIR}/dynd/src/git_version.cpp
+                  )
 
-    target_link_libraries(${module} pydynd)
+foreach(module dynd.ndt.type dynd.ndt.json dynd.nd.callable dynd.nd.functional dynd.nd.registry)
+    cython_add_module(${module} ${module}_pyx True dynd/src/conversions.cpp)
 endforeach(module)
 
-add_dependencies(pydynd dynd.nd.array_pyx dynd.nd.callable_pyx dynd.ndt.type_pyx)
-
 # Run a postprocess script to work around some Cython bugs
 # that haven't been fixed in the latest release.
 postprocess_cython( postprocess.py dynd.ndt.type_postprocess dynd.ndt.type_pyx dynd.ndt.type)
 postprocess_cython( postprocess.py dynd.nd.array_postprocess dynd.nd.array_pyx dynd.nd.array)
 postprocess_cython( postprocess.py dynd.nd.callable_postprocess dynd.nd.callable_pyx dynd.nd.callable)
-add_dependencies(pydynd dynd.ndt.type_postprocess dynd.nd.array_postprocess dynd.nd.callable_postprocess)
+
+foreach(module dynd.config dynd.ndt.type dynd.ndt.json dynd.nd.array dynd.nd.callable dynd.nd.functional dynd.nd.registry)
+    # Temporarily continue to define PYDYND_EXPORT to avoid inconsistent linkage warnings.
+    # This should be removed once the macros have been refactored to hide all symbols
+    # other than module initialization routines.
+    set_property(
+        TARGET ${module}
+        PROPERTY COMPILE_DEFINITIONS PYDYND_EXPORT
+    )
+    # Make sure the api headers are all built and postprocessed
+    # before anything tries to build conversions.cpp
+    add_dependencies(${module} dynd.nd.array_postprocess dynd.nd.callable_postprocess dynd.ndt.type_postprocess)
+    if(DYND_INSTALL_LIB)
+        target_link_libraries(${module} "${LIBDYND_LIBRARIES}")
+    else()
+        target_link_libraries(${module} libdynd)
+        if(UNIX)
+            # Make sure libdynd is on the rpath.
+            # On Windows, the dll is loaded dynamically via the logic in
+            # dynd/__init__.py
+            if(APPLE)
+                set(module_install_rpath "@loader_path")
+            else()
+                set(module_install_rpath "$ORIGIN")
+            endif()
+            string(REPLACE "." ";" module_directories "${module}")
+            list(LENGTH module_directories i)
+            while(${i} GREATER 2)
+                set(module_install_rpath "${module_install_rpath}/..")
+                math(EXPR i "${i} - 1" )
+            endwhile(${i} GREATER 2)
+            set_target_properties(${module} PROPERTIES INSTALL_RPATH ${module_install_rpath})
+        endif()
+    endif()
+endforeach(module)

dynd/__init__.py

@@ -1,6 +1,7 @@
 import os
 if os.name == 'nt':
     # Manually load dlls before loading the extension modules.
+    # This is handled via rpaths on Unix based systems.
     from ctypes import cdll
     import os.path
     # If libdynd.dll is already on the path, use it.
@@ -46,10 +47,6 @@
                                         'libdynd.dll')
             if os.path.isfile(libdynd_path):
                 cdll.LoadLibrary(libdynd_path)
-    # Load libpydynd from current directory now that libdynd
-    # has been loaded.
-    pydynd_dir = os.path.dirname(os.path.realpath(__file__))
-    cdll.LoadLibrary(os.path.join(pydynd_dir, 'pydynd.dll'))
 
 from .config import _dynd_version_string as __libdynd_version__, \
                 _dynd_python_version_string as __version__, \

setup.py

@@ -84,8 +84,9 @@ def run(self):
     extra_cmake_args = shlex.split(self.extra_cmake_args)
     cmake_command = ['cmake'] + extra_cmake_args + [pyexe_option,
                      install_lib_option, build_tests_option,
-                     static_lib_option, source]
+                     static_lib_option]
     if sys.platform != 'win32':
+        cmake_command.append(source)
         self.spawn(cmake_command)
         self.spawn(['make'])
     else:
@@ -94,26 +95,19 @@ def run(self):
             if is_64_bit:
                 cmake_generator += ' Win64'
             cmake_command += ['-G', cmake_generator]
+        cmake_command.append(source)
         self.spawn(cmake_command)
         # Do the build
         self.spawn(['cmake', '--build', '.', '--config', build_type])
 
     import glob, shutil
 
-    # Move the built libpydynd library to the place expected by the Python build
     if sys.platform != 'win32':
-        name, = glob.glob('libpydynd.*')
-        try:
-            os.makedirs(os.path.join(build_lib, 'dynd'))
-        except OSError:
-            pass
-        shutil.move(name, os.path.join(build_lib, 'dynd', name))
         if install_lib_option.split('=')[1] == 'OFF':
             name, = glob.glob('libraries/libdynd/libdynd.*')
             short_name = split(name)[1]
             shutil.move(name, os.path.join(build_lib, 'dynd', short_name))
     else:
-        shutil.move(os.path.join(build_type, 'pydynd.dll'), os.path.join(build_lib, 'dynd', 'pydynd.dll'))
         if install_lib_option.split('=')[1] == 'OFF':
             names = glob.glob('libraries/libdynd/%s/libdynd.*' % build_type)
             for name in names: