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.

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

Fix building for GPU with CUDA 12.3.1 #8853

Closed
wants to merge 10 commits into from
Prev Previous commit
Next Next commit
review
  • Loading branch information
luhenry committed Feb 27, 2024
commit 8e13b396bfab4318c9a965d8bc25f1c49a7a5e4b
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,12 @@ minimal: #: Minimal build
$(MAKE) cmake BUILD_DIR=release BUILD_TYPE=release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_BUILD_MINIMAL=ON"
$(MAKE) build BUILD_DIR=release

# We specify -Dfolly_SOURCE=BUNDLED as we need to pick up the fix at CMake/resolve_dependency_modules/folly/folly-cudacc.patch
gpu: #: Build with GPU support
luhenry marked this conversation as resolved.
Show resolved Hide resolved
$(MAKE) cmake BUILD_DIR=release BUILD_TYPE=release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DVELOX_ENABLE_GPU=ON -Dfolly_SOURCE=BUNDLED"
luhenry marked this conversation as resolved.
Show resolved Hide resolved
$(MAKE) build BUILD_DIR=release

# We specify -Dfolly_SOURCE=BUNDLED as we need to pick up the fix at CMake/resolve_dependency_modules/folly/folly-cudacc.patch
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 -Dfolly_SOURCE=BUNDLED"
$(MAKE) build BUILD_DIR=debug
Expand Down
2 changes: 1 addition & 1 deletion velox/experimental/wave/common/Type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ PhysicalType fromCpuType(const Type& type) {
return ans;
}

std::string PhysicalType::kindString(Kind kind) {
std::string_view PhysicalType::kindString(Kind kind) {
switch (kind) {
case kInt8:
return "Int8";
Expand Down
2 changes: 1 addition & 1 deletion velox/experimental/wave/common/Type.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct PhysicalType {
int32_t numChildren;
PhysicalType** children;

static std::string kindString(Kind kind);
static std::string_view kindString(Kind kind);
};

PhysicalType fromCpuType(const Type&);
Expand Down
2 changes: 1 addition & 1 deletion velox/experimental/wave/common/tests/BlockTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ TEST_F(BlockTest, boolToIndices) {
std::vector<int32_t> referenceIndices(kNumFlags);
std::vector<int32_t> referenceSizes(kNumBlocks);
uint8_t* flags = flagsBuffer->as<uint8_t>();
for (auto i = 0; i < kNumFlags; ++i) {
for (size_t i = 0; i < kNumFlags; ++i) {
if ((i >> 8) % 17 == 0) {
flags[i] = 0;
} else if ((i >> 8) % 23 == 0) {
Expand Down