Merge pull request #1 from karthikeyann/integrate_custom_cudf_hash_join

Integrate custom cudf hash join

Author: bdice

.github/workflows/linux-build.yml

@@ -20,10 +20,6 @@ on:
       - "velox-cudf"
       - "pull-request/[0-9]+"
 
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref }}
-#   cancel-in-progress: true
-
 permissions:
   contents: read
 
@@ -113,7 +109,7 @@ jobs:
           LIBHDFS3_CONF: "${{ github.workspace }}/scripts/hdfs-client.xml"
         working-directory: _build/release
         run: |
-          ctest -j 8 --output-on-failure --no-tests=error -E "velox_exec_test|velox_hdfs_file_test|velox_s3"
+          ctest -j 8 --output-on-failure --no-tests=error -E "velox_exec_test|velox_hdfs_file_test|velox_s3|cudf"
 
   ubuntu-debug:
     runs-on: linux-amd64-cpu8
@@ -169,4 +165,4 @@ jobs:
 
       - name: Run Tests
         run: |
-          cd _build/debug && ctest -j 8 --output-on-failure --no-tests=error -E velox_exec_test
+          cd _build/debug && ctest -j 8 --output-on-failure --no-tests=error -E "velox_exec_test|cudf"

.gitignore

@@ -79,6 +79,7 @@ m4/lt~obsolete.m4
 #m4/
 build/
 _build/
+.cache/
 .ccache/
 #*.m4
 *.o
@@ -88,7 +89,7 @@ _build/
 *.pdf
 *.swp
 a.out
-CMake/resolve_dependency_module/boost/FindBoost.cmake
+CMake/resolve_dependency_modules/boost/FindBoost.cmake
 __cmake_systeminformation/
 
 #==============================================================================#
@@ -322,3 +323,6 @@ src/amalgamation/
 velox/docs/sphinx/source/README_generated_*
 velox/docs/bindings/python/_generate/*
 scripts/bm-report/report.html
+
+aws-sdk-cpp
+xsimd

CMakeLists.txt

@@ -337,7 +337,8 @@ if("${ENABLE_ALL_WARNINGS}")
        -Wno-unused-parameter \
        -Wno-sign-compare \
        -Wno-ignored-qualifiers \
-       -Wnon-virtual-dtor \
+       -Wno-missing-field-initializers \
+       -Wno-deprecated-copy \
        ${KNOWN_COMPILER_SPECIFIC_WARNINGS}")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra ${KNOWN_WARNINGS}")
@@ -543,9 +544,7 @@ include_directories(SYSTEM velox/external)
 if(NOT VELOX_DISABLE_GOOGLETEST)
   set(gtest_SOURCE AUTO)
   resolve_dependency(gtest)
-  set(VELOX_GTEST_INCUDE_DIR
-      "${gtest_SOURCE_DIR}/googletest/include"
-      PARENT_SCOPE)
+  set(VELOX_GTEST_INCLUDE_DIR "${gtest_SOURCE_DIR}/googletest/include")
 endif()
 
 set_source(xsimd)

Makefile

@@ -97,7 +97,7 @@ cmake:					#: Use CMake to create a Makefile build system
 		${EXTRA_CMAKE_FLAGS}
 
 cmake-gpu:
-	$(MAKE) EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON" cmake
+	$(MAKE) EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON -DVELOX_ENABLE_CUDF=ON" cmake
 
 build:					#: Build the software based in BUILD_DIR and BUILD_TYPE variables
 	cmake --build $(BUILD_BASE_DIR)/$(BUILD_DIR) -j $(NUM_THREADS)
@@ -121,11 +121,11 @@ minimal:				 #: Minimal build
 	$(MAKE) build BUILD_DIR=release
 
 gpu:						 #: Build with GPU support
-	$(MAKE) cmake BUILD_DIR=release BUILD_TYPE=release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON"
+	$(MAKE) cmake BUILD_DIR=release BUILD_TYPE=release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON -DVELOX_ENABLE_CUDF=ON"
 	$(MAKE) build BUILD_DIR=release
 
 gpu_debug:			 #: Build with debugging symbols and GPU support
-	$(MAKE) cmake BUILD_DIR=debug BUILD_TYPE=debug EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON"
+	$(MAKE) cmake BUILD_DIR=debug BUILD_TYPE=debug EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON -DVELOX_ENABLE_CUDF=ON"
 	$(MAKE) build BUILD_DIR=debug
 
 dwio:						#: Minimal build with dwio enabled.

build.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# 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 -euo pipefail
+
+# Run this to launch the CUDA container:
+# docker-compose run -e NUM_THREADS=$(nproc) --rm ubuntu-cuda-cpp /bin/bash
+# Then invoke ./build.sh to build with GPU support and run tests.
+
+# Run a GPU build and test
+pushd "$(dirname ${0})"
+
+CUDA_ARCHITECTURES="native" make gpu
+
+cd _build/release
+
+ctest -R cudf -V
+
+popd

docker-compose.yml

@@ -29,6 +29,35 @@ services:
       NUM_THREADS: 8 # default value for NUM_THREADS
       VELOX_DEPENDENCY_SOURCE: BUNDLED # Build dependencies from source
       CCACHE_DIR: "/velox/.ccache"
+      CMAKE_EXPORT_COMPILE_COMMANDS: 1
+    volumes:
+      - .:/velox:delegated
+    command: scripts/docker-command.sh
+
+  ubuntu-cuda-cpp:
+    # Usage:
+    #   docker-compose pull ubuntu-cuda-cpp or docker-compose build ubuntu-cuda-cpp
+    #   docker-compose run --rm ubuntu-cuda-cpp
+    #   or
+    #   docker-compose run -e NUM_THREADS=<NUMBER_OF_THREADS_TO_USE> --rm ubuntu-cuda-cpp
+    #   to set the number of threads used during compilation
+    #image: ghcr.io/facebookincubator/velox-dev:amd64-ubuntu-22.04-avx
+    build:
+      context: .
+      dockerfile: scripts/ubuntu-22.04-cuda-12.2-cpp.dockerfile
+    environment:
+      NUM_THREADS: 8 # default value for NUM_THREADS
+      VELOX_DEPENDENCY_SOURCE: BUNDLED # Build dependencies from source
+      CCACHE_DIR: "/velox/.ccache"
+      CMAKE_EXPORT_COMPILE_COMMANDS: 1
+    privileged: true
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
     volumes:
       - .:/velox:delegated
     command: scripts/docker-command.sh

fix-compile-commands.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# 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.
+
+sed -i 's|/velox/|/home/nfs/bdice/rapids1/velox/|g' compile_commands.json

install-aws-sdk.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# 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.
+
+if [ ! -d "aws-sdk-cpp" ]; then
+    git clone https://github.com/aws/aws-sdk-cpp --recurse-submodules
+fi
+cd aws-sdk-cpp
+
+mkdir -p build
+cd build
+
+cmake ../ \
+  -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_PREFIX_PATH=/usr/local \
+  -DCMAKE_INSTALL_PREFIX=/usr/local \
+  -DBUILD_ONLY="s3;sts;cognito-identity;identity-management" \
+  -DENABLE_TESTING=OFF
+cmake --build . --config=Debug
+cmake --install . --config=Debug
+
+#cmake ../ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local
+#make
+#sudo make install

install-xsimd.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# 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.
+
+if [ ! -d "xsimd" ]; then
+    git clone https://github.com/xtensor-stack/xsimd --recurse-submodules
+fi
+cd xsimd
+
+mkdir -p build
+cd build
+
+cmake ../
+cmake --build . --config=Debug
+cmake --install . --config=Debug

scripts/ubuntu-22.04-cuda-12.2-cpp.dockerfile

@@ -0,0 +1,39 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# 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.
+ARG base=nvidia/cuda:12.2.2-devel-ubuntu22.04
+# Set a default timezone, can be overriden via ARG
+ARG tz="Europe/Madrid"
+
+FROM ${base}
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN apt update && \
+      apt install -y sudo \
+            lsb-release \
+            pip \
+            python3 \
+            python3-six
+
+
+ADD scripts /velox/scripts/
+
+# TZ and DEBIAN_FRONTEND="noninteractive"
+# are required to avoid tzdata installation
+# to prompt for region selection.
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV TZ=${tz}
+RUN /velox/scripts/setup-ubuntu.sh
+
+WORKDIR /velox