Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nvrtc to setup scripts. #11335

Closed
wants to merge 9 commits into from
Closed

Add nvrtc to setup scripts. #11335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b12e76c
add nvrtc to install scripts
assignUser Oct 23, 2024
92ba55a
turn on gpu build
assignUser Oct 23, 2024
e5e3738
install cuda-driver-devel
assignUser Oct 23, 2024
5c00e24
add missing links
assignUser Oct 23, 2024
8024833
label and exclude test using cuda driver
assignUser Oct 23, 2024
85592f1
fix typo in install script
assignUser Oct 23, 2024
045d349
turn all wave libraries that link against wave_common into standalone…
assignUser Oct 23, 2024
4c2a837
add missing label
assignUser Oct 24, 2024
7424923
format
assignUser Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
"-DVELOX_ENABLE_GCS=ON"
"-DVELOX_ENABLE_ABFS=ON"
"-DVELOX_ENABLE_REMOTE_FUNCTIONS=ON"
"-DVELOX_ENABLE_GPU=OFF"
"-DVELOX_ENABLE_GPU=ON"
"-DVELOX_MONO_LIBRARY=ON"
)
make release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS[*]}"
Expand All @@ -135,7 +135,7 @@ jobs:
working-directory: _build/release
run: |
export CLASSPATH=`/usr/local/hadoop/bin/hdfs classpath --glob`
ctest -j 8 --output-on-failure --no-tests=error
ctest -j 8 --label-exclude cuda_driver --output-on-failure --no-tests=error

ubuntu-debug:
runs-on: 8-core-ubuntu
Expand Down
3 changes: 2 additions & 1 deletion scripts/setup-centos9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ function install_arrow {
function install_cuda {
# See https://developer.nvidia.com/cuda-downloads
dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo
dnf install -y cuda-nvcc-$(echo $1 | tr '.' '-') cuda-cudart-devel-$(echo $1 | tr '.' '-')
local dashed="$(echo $1 | tr '.' '-')"
dnf install -y cuda-nvcc-$dashed cuda-cudart-devel-$dashed cuda-nvrtc-devel-$dashed cuda-driver-devel-$dashed
}

function install_velox_deps {
Expand Down
3 changes: 2 additions & 1 deletion scripts/setup-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ function install_cuda {
rm cuda-keyring_1.1-1_all.deb
$SUDO apt update
fi
$SUDO apt install -y cuda-nvcc-$(echo $1 | tr '.' '-') cuda-cudart-dev-$(echo $1 | tr '.' '-')
local dashed="$(echo $1 | tr '.' '-')"
$SUDO apt install -y cuda-nvcc-$dashed cuda-cudart-dev-$dashed cuda-nvrtc-dev-$dashed cuda-driver-dev-$dashed
}

function install_velox_deps {
Expand Down
6 changes: 4 additions & 2 deletions velox/experimental/wave/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

velox_add_library(
add_library(
velox_wave_common
GpuArena.cpp
Buffer.cpp
Expand All @@ -23,11 +23,13 @@ velox_add_library(
Type.cpp
ResultStaging.cpp)

velox_link_libraries(
target_link_libraries(
velox_wave_common
velox_exception
velox_common_base
velox_type
CUDA::cuda_driver
CUDA::cudart
CUDA::nvrtc)

if(${VELOX_BUILD_TESTING})
Expand Down
9 changes: 2 additions & 7 deletions velox/experimental/wave/common/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,11 @@ add_executable(
HashTestUtil.cpp)

add_test(velox_wave_common_test velox_wave_common_test)
set_tests_properties(velox_wave_common_test PROPERTIES LABELS cuda_driver)

target_link_libraries(
velox_wave_common_test
velox_wave_common
velox_memory
velox_time
velox_exception
GTest::gtest
GTest::gtest_main
gflags::gflags
glog::glog
Folly::folly
CUDA::nvrtc)
CUDA::cudart)
5 changes: 3 additions & 2 deletions velox/experimental/wave/dwio/decode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

add_subdirectory(tests)

velox_add_library(velox_wave_decode GpuDecoder.cu)
add_library(velox_wave_decode GpuDecoder.cu)

velox_link_libraries(velox_wave_decode velox_wave_common)
target_link_libraries(
velox_wave_decode velox_wave_common)
7 changes: 2 additions & 5 deletions velox/experimental/wave/dwio/decode/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@
add_executable(velox_wave_decode_test GpuDecoderTest.cu)

add_test(velox_wave_decode_test velox_wave_decode_test)
set_tests_properties(velox_wave_decode_test PROPERTIES LABELS cuda_driver)

target_link_libraries(
velox_wave_decode_test
velox_wave_decode
velox_wave_common
velox_memory
velox_time
velox_exception
GTest::gtest
GTest::gtest_main
gflags::gflags
glog::glog
Folly::folly
CUDA::nvrtc)
fmt::fmt)
9 changes: 5 additions & 4 deletions velox/experimental/wave/exec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

velox_add_library(velox_wave_stream OperandSet.cpp Wave.cpp)
add_library(velox_wave_stream OperandSet.cpp Wave.cpp)

velox_link_libraries(velox_wave_stream Folly::folly fmt::fmt xsimd)
target_link_libraries(
velox_wave_stream Folly::folly fmt::fmt xsimd)

velox_add_library(
add_library(
velox_wave_exec
Aggregation.cpp
AggregationInstructions.cu
Expand All @@ -34,7 +35,7 @@ velox_add_library(
WaveHiveDataSource.cpp
WaveSplitReader.cpp)

velox_link_libraries(
target_link_libraries(
velox_wave_exec
velox_wave_vector
velox_wave_common
Expand Down
35 changes: 9 additions & 26 deletions velox/experimental/wave/exec/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,17 @@ target_link_libraries(
velox_type
velox_vector
velox_vector_fuzzer
Boost::atomic
Boost::context
Boost::date_time
Boost::filesystem
Boost::program_options
Boost::regex
Boost::thread
Boost::system
gtest
gtest_main
gmock
GTest::gtest
GTest::gtest_main
GTest::gmock
Folly::folly
gflags::gflags
glog::glog
fmt::fmt
${FILESYSTEM}
CUDA::nvrtc)
CUDA::cudart)

add_test(velox_wave_exec_test velox_wave_exec_test)
set_tests_properties(velox_wave_exec_test PROPERTIES LABELS cuda_driver)

if(${VELOX_ENABLE_BENCHMARKS})
add_executable(velox_wave_benchmark WaveBenchmark.cpp)
Expand Down Expand Up @@ -87,22 +79,13 @@ if(${VELOX_ENABLE_BENCHMARKS})
velox_type
velox_vector
velox_vector_fuzzer
Boost::atomic
Boost::context
Boost::date_time
Boost::filesystem
Boost::program_options
Boost::regex
Boost::thread
Boost::system
gtest
gtest_main
gmock
GTest::gtest
GTest::gtest_main
GTest::gmock
${FOLLY_BENCHMARK}
Folly::folly
gflags::gflags
glog::glog
fmt::fmt
${FILESYSTEM}
CUDA::nvrtc)
CUDA::cudart)
endif()
2 changes: 1 addition & 1 deletion velox/experimental/wave/vector/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

add_executable(velox_wave_vector_test VectorTest.cpp)

add_test(veloxwave__vector_test velox_wave_vector_test)
add_test(veloxwave_vector_test velox_wave_vector_test)

target_link_libraries(
velox_wave_vector_test
Expand Down
Loading