[WIP] Binary Operators

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "thirdparty/moderngpu"]
 	path = thirdparty/moderngpu
 	url = https://github.com/moderngpu/moderngpu.git
+[submodule "thirdparty/jitify"]
+	path = thirdparty/jitify
+	url = https://github.com/NVIDIA/jitify.git

CMakeLists.txt

@@ -31,6 +31,7 @@ set(CMAKE_CXX_STANDARD 11)
 message(STATUS "Using C++ standard: c++${CMAKE_CXX_STANDARD}")
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Configuration/")
 message(STATUS "CMAKE_MODULE_PATH:" "${CMAKE_MODULE_PATH}")
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
@@ -66,6 +67,9 @@ if(CUDA_FOUND)
     set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-Werror cross-execution-space-call;-Xcompiler -Wall,-Werror)
 
     message(STATUS "CUDA_NVCC_FLAGS: ${CUDA_NVCC_FLAGS}")
+
+    include(ConfigCuda RESULT_VARIABLE result)
+    message(STATUS "ConfigCuda: ${result}")
 else()
     message(FATAL_ERROR "CUDA not found, please check your settings.")
 endif()
@@ -84,13 +88,17 @@ else()
 endif()
 
 include_directories(
+    "${CMAKE_CURRENT_SOURCE_DIR}/src"
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cub"
+    "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/jitify"
     "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/moderngpu/src"
     "${CUDA_INCLUDE_DIRS}"
     "${ARROW_INCLUDEDIR}"
 )
 
+link_directories(${CUDA_LIBRARY_DIR} ${CUDA_LIBRARY_STUBS_DIR})
+
 IF(CUDA_VERSION_MAJOR GREATER 7)
     set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-gencode;arch=compute_60,code=sm_60)
 ENDIF(CUDA_VERSION_MAJOR GREATER 7)
@@ -120,7 +128,18 @@ if(HT_LEGACY_ALLOCATOR)
 endif()
 
 
-cuda_add_library(gdf SHARED
+## Benchmark
+include(ConfigBenchmark RESULT_VARIABLE result)
+message(STATUS "ConfigBenchmark: ${result}")
+
+
+## Binary Operations
+add_subdirectory(src/binary)
+get_directory_property(binary_operation_source_files DIRECTORY src/binary DEFINITION source_files)
+
+
+## Variable 'libgdf_source_files' with all source files.
+set(libgdf_source_files
     src/binaryops.cu
     src/bitmaskops.cu
     src/column.cpp
@@ -142,13 +161,44 @@ cuda_add_library(gdf SHARED
     src/unaryops.cu
     #src/windowedops.cu
     src/quantiles.cu
+    ${binary_operation_source_files}
 )
 
+
+cuda_add_library(gdf SHARED ${libgdf_source_files})
+
+
+## Position Independent Code for shared library
+set_target_properties(gdf PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(gdf PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+
+## Build static library
+## By default is disabled.
+## Add -DLIBGDF_STATIC_LIB=ON as cmake parameter to create the static library.
+option(LIBGDF_STATIC_LIB "Build static library for libgdf" OFF)
+if(LIBGDF_STATIC_LIB)
+    message(STATUS "libgdf static library enabled")
+    cuda_add_library(gdf_static STATIC ${libgdf_source_files})
+    set_target_properties(gdf_static PROPERTIES OUTPUT_NAME gdf)
+else()
+    message(STATUS "libgdf static library disabled")
+endif()
+
+
 if (ARROW_NUMERIC_VERSION EQUAL 900)
   # arrow-0.9 requires boost_regex
-  target_link_libraries(gdf arrow boost_regex)
+  target_link_libraries(gdf arrow boost_regex ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB})
+
+  if(LIBGDF_STATIC_LIB)
+    target_link_libraries(gdf_static arrow boost_regex ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB})
+  endif()
 else()
-  target_link_libraries(gdf arrow)
+  target_link_libraries(gdf arrow ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB})
+
+  if(LIBGDF_STATIC_LIB)
+    target_link_libraries(gdf_static arrow ${CUDA_CUDA_LIB} ${CUDA_NVRTC_LIB})
+  endif()
 endif()
 
 # Command to symlink files into the build directory
@@ -181,6 +231,9 @@ add_custom_command(TARGET pytest POST_BUILD
 # The install target
 install(TARGETS gdf LIBRARY DESTINATION lib)
 install(DIRECTORY include/gdf DESTINATION include)
+if(LIBGDF_STATIC_LIB)
+    install(TARGETS gdf_static ARCHIVE DESTINATION lib)
+endif()
 
 # Configure the C++ tests
 find_package(GTest QUIET)

README.md

@@ -66,7 +66,7 @@ not necessary.
 
 You can install Boost C++ 1.58 from sources as well: https://www.boost.org/doc/libs/1_58_0/more/getting_started/unix-variants.html
 
-To run the python tests it is recommended to setup a conda environment for 
+To run the python tests it is recommended to setup a conda environment for
 the dependencies.
 
 ```bash
@@ -114,6 +114,12 @@ $ cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..
 To build the C/C++ code, run `make`.  This should produce a shared library
 named `libgdf.so` or `libgdf.dylib`.
 
+To build the static library for libgdf just run cmake with:
+```bash
+$ cmake -DLIBGDF_STATIC_LIB=ON -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..
+```
+Note: By default the option LIBGDF_STATIC_LIB is disabled (default value OFF).
+
 If you run into compile errors about missing header files:
 
 ```bash
@@ -138,3 +144,36 @@ conda environment activated), run below to exceute test:
 ```bash
 $ make pytest   # this auto trigger target "copy_python"
 ```
+
+### Benchmark
+
+It is used [Google Benchmark](https://github.com/google/benchmark) for this purpose.
+Refer to that repository in order to get more information related to its functionality.
+
+In order to enable the benchmark functionality, which by default is disabled,
+it is required to add the option BENCHMARK in the command line when 'cmake' is executed.
+It is also recommended to use release build type.
+
+```bash
+$ cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK=ON path/to/libgdf
+```
+
+When the build process is completed, the benchmark binary files will be located in the 'bench' folder.
+In order to get the different input arguments for a benchmark binary file,
+add the argument '--help' in the command line when the file is executed.
+
+The benchmark is applied to the following features:
+* Binary Operations (NVRTC - Jitify).
+
+###### Binary Operations
+
+Recommended input arguments when this benchmark is executed.
+```bash
+$ BinaryOperationsBench --benchmark_counters_tabular=true
+```
+
+### Benchmark - Troubleshoot
+
+When a message related to CPU scaling (`***WARNING*** CPU scaling is enabled`) appeared,
+refer to the section [Disable CPU frequency scaling](https://github.com/google/benchmark#disable-cpu-frequency-scaling)
+in the Google Benchmark documentation.

cmake/Configuration/ConfigBenchmark.cmake

@@ -0,0 +1,28 @@
+#=============================================================================
+# Copyright 2018-2019 BlazingDB, Inc.
+#     Copyright 2018 Christian Noboa Mardini <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+## Build Benchmark
+## By default is disabled.
+## Add -DBENCHMARK:BOOL=ON as cmake parameter to create the benchmark.
+
+option(BENCHMARK "Benchmark" OFF)
+
+if(BENCHMARK)
+    message(STATUS "Benchmark is enabled")
+    include(GoogleBenchmark)
+    add_subdirectory(src/bench)
+endif()

cmake/Configuration/ConfigCuda.cmake

@@ -0,0 +1,38 @@
+#=============================================================================
+# Copyright 2018-2019 BlazingDB, Inc.
+#     Copyright 2018 Christian Noboa Mardini <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+set(CUDA_LIBRARY_DIR       ${CUDA_TOOLKIT_ROOT_DIR})
+set(CUDA_LIBRARY_STUBS_DIR ${CUDA_TOOLKIT_ROOT_DIR})
+
+## Based on NVRTC (Runtime Compilation) - CUDA Toolkit Documentation - v9.2.148
+## 2.2. Installation
+if(CMAKE_HOST_APPLE)
+    set(CUDA_LIBRARY_DIR       ${CUDA_TOOLKIT_ROOT_DIR}/lib)
+    set(CUDA_LIBRARY_STUBS_DIR ${CUDA_TOOLKIT_ROOT_DIR}/lib/stubs)
+elseif(CMAKE_HOST_UNIX)
+    set(CUDA_LIBRARY_DIR       ${CUDA_TOOLKIT_ROOT_DIR}/lib64)
+    set(CUDA_LIBRARY_STUBS_DIR ${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs)
+elseif(CMAKE_HOST_WIN32)
+    set(CUDA_LIBRARY_DIR       ${CUDA_TOOLKIT_ROOT_DIR}\lib\x64)
+    set(CUDA_LIBRARY_STUBS_DIR ${CUDA_TOOLKIT_ROOT_DIR}\lib\x64\stubs)
+endif()
+
+set(CUDA_CUDA_LIB  cuda)
+set(CUDA_NVRTC_LIB nvrtc)
+
+message(STATUS "CUDA_LIBRARY_DIR: ${CUDA_LIBRARY_DIR}")
+message(STATUS "CUDA_LIBRARY_STUBS_DIR: ${CUDA_LIBRARY_STUBS_DIR}")

cmake/Modules/GoogleBenchmark.cmake

@@ -0,0 +1,48 @@
+#=============================================================================
+# Copyright 2018-2019 BlazingDB, Inc.
+#     Copyright 2018 Christian Noboa Mardini <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+# Download and unpack google-benchmark at configure time
+configure_file(${CMAKE_SOURCE_DIR}/cmake/Templates/GoogleBenchmark.CMakeLists.txt.cmake
+               ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/download/CMakeLists.txt)
+
+execute_process(
+    COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
+    RESULT_VARIABLE result
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/download
+)
+
+if(result)
+    message(FATAL_ERROR "CMake step for google benchmark failed: ${result}")
+endif()
+
+
+execute_process(
+    COMMAND ${CMAKE_COMMAND} --build .
+    RESULT_VARIABLE result
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/download
+)
+
+if(result)
+    message(FATAL_ERROR "Build step for google benchmark failed: ${result}")
+endif()
+
+
+set(GOOGLE_BENCHMARK_LIB         "benchmark")
+set(GOOGLE_BENCHMARK_MAIN_LIB    "benchmark_main")
+set(GOOGLE_BENCHMARK_DIR         "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/install")
+set(GOOGLE_BENCHMARK_INCLUDE_DIR "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/install/include")
+set(GOOGLE_BENCHMARK_LIBRARY_DIR "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/install/lib")

cmake/Templates/GoogleBenchmark.CMakeLists.txt.cmake

@@ -0,0 +1,36 @@
+#=============================================================================
+# Copyright 2018-2019 BlazingDB, Inc.
+#     Copyright 2018 Christian Noboa Mardini <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+cmake_minimum_required(VERSION 3.0)
+
+project(google-benchmark)
+
+include(ExternalProject)
+
+ExternalProject_Add(
+    google-benchmark
+    GIT_REPOSITORY    https://github.com/google/benchmark.git
+    GIT_TAG           master
+    SOURCE_DIR        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/source"
+    BINARY_DIR        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/build"
+    INSTALL_DIR       "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/install"
+    CMAKE_ARGS        -DCMAKE_BUILD_TYPE=Release
+                      -DBENCHMARK_ENABLE_TESTING=OFF
+                      -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
+                      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=OFF
+                      -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/thirdparty/google-benchmark/install
+)

conda_environments/dev_py35.yml

@@ -10,7 +10,7 @@ dependencies:
 - numpy=1.12.1=py35_0
 - openssl=1.0.2k=2
 - pip=9.0.1=py35_1
-- py=1.4.33=py35_0
+- py=1.5.2
 - pycparser=2.17=py35_0
 - pytest=3.0.7=py35_0
 - python=3.5.3=1