Merge pull request #614 from izaid/option

Updates to match libdynd

Author: izaid

CMakeLists.txt

@@ -34,7 +34,6 @@ list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 include(GetGitRevisionDescriptionDyND)
 
-find_package(CUDA 6.5)
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibsNew REQUIRED)
 find_package(NumPy REQUIRED)
@@ -55,22 +54,10 @@ endif()
 
 if (DYND_INSTALL_LIB)
     find_package(LibDyND REQUIRED)
-    if(LIBDYND_CUDA)
-        option(DYND_CUDA
-            "Use a libdynd built with CUDA. If DYND_INSTALL_LIB is ON, this defaults to the DYND_CUDA option used when building libdynd. Otherwise it defaults to OFF."
-            ON)
-    else()
-        option(DYND_CUDA
-            "Use a libdynd built with CUDA. If DYND_INSTALL_LIB is ON, this defaults to the DYND_CUDA option used when building libdynd. Otherwise it defaults to OFF."
-            OFF)
-    endif()
 else()
     set(DYND_SHARED_LIB ON)
     # USE_RELATIVE_RPATH is inherited from this cmakelists, so need to set it here
     option(DYND_BUILD_TESTS "Build the googletest unit tests for libdynd." ON)
-    option(DYND_CUDA
-        "Use a libdynd built with CUDA. If DYND_INSTALL_LIB is ON, this defaults to the DYND_CUDA option used building that library. Otherwise it defaults to OFF."
-        OFF)
 
     if (NOT EXISTS "${PROJECT_SOURCE_DIR}/libraries/libdynd/include/dynd/array.hpp")
         message(FATAL_ERROR
@@ -156,14 +143,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     )
 
-if(DYND_CUDA)
-    include_directories(${CUDA_INCLUDE_DIRS})
-    add_definitions(-DDYND_CUDA)
-    set(DYND_CUDA_01 1)
-else()
-    set(DYND_CUDA_01 0)
-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)

cmake/FindLibDyND.cmake

@@ -20,18 +20,18 @@
 # distribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-# 
+#
 #============================================================================
 
 # Try to find a libdynd-config program
@@ -90,24 +90,8 @@ if(NOT _DYND_SEARCH_SUCCESS MATCHES 0)
         "Error getting additional properties of libdynd:\n${_DYND_ERROR_VALUE}")
 endif()
 
-# Get whether or not libdynd was built with cuda support
-execute_process(COMMAND "${_LIBDYND_CONFIG}" "-cuda"
-    RESULT_VARIABLE _DYND_SEARCH_SUCCESS
-    OUTPUT_VARIABLE LIBDYND_CUDA
-    ERROR_VARIABLE _DYND_ERROR_VALUE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(NOT _DYND_SEARCH_SUCCESS MATCHES 0)
-    message(FATAL_ERROR
-        "Error getting additional properties of libdynd:\n${_DYND_ERROR_VALUE}")
-endif()
-# Verify that the value in LIBDYND_CUDA is either "ON" or "OFF"
-if(NOT ("${LIBDYND_CUDA}" STREQUAL "ON" OR "${LIBDYND_CUDA}" STREQUAL "OFF"))
-    message(FATAL_ERROR "Unrecognized cuda option returned from libdynd-config.")
-endif()
-
 find_package_message(LIBDYND
     "Found LibDyND: version \"${LIBDYND_VERSION}\",  ${LIBDYND_LIBRARIES}"
     "${LIBDYND_INCLUDE_DIRS}${LIBDYND_LIBRARIES}${LIBDYND_VERSION}")
 
 set(NUMPY_FOUND TRUE)
-

dynd/src/array_from_py.cpp

@@ -18,6 +18,7 @@
 #include <dynd/types/substitute_shape.hpp>
 #include <dynd/types/type_type.hpp>
 #include <dynd/types/var_dim_type.hpp>
+#include <dynd/option.hpp>
 
 #include "array_from_py.hpp"
 #include "array_from_py_typededuction.hpp"
@@ -183,8 +184,7 @@ inline void convert_one_pyscalar_option(const ndt::type &tp,
                                         PyObject *obj)
 {
   if (obj == Py_None) {
-    tp.extended<ndt::option_type>()->assign_na(arrmeta, out,
-                                               &eval::default_eval_context);
+    nd::old_assign_na(tp, arrmeta, out);
   }
   else {
     throw std::runtime_error("unable to convert to option value");