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

Improve compatibility mode consistency #567

Merged
merged 4 commits into from
Dec 9, 2024
Merged

Improve compatibility mode consistency #567

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4553bb4
Improve compat mode consistency
kingcrimsontianyu Dec 4, 2024
f108999
Fix a bug
kingcrimsontianyu Dec 4, 2024
72a930c
Rename variable for clarity
kingcrimsontianyu Dec 4, 2024
d17da34
Merge branch 'branch-25.02' into improve-compat-mode-consistency
vuule Dec 9, 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
32 changes: 24 additions & 8 deletions cpp/src/file_handle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,37 @@ FileHandle::FileHandle(const std::string& file_path,
}

// Try to open the file with the O_DIRECT flag. Fall back to compatibility mode, if it fails.
auto handle_o_direct_except = [this] {
if (_compat_mode == CompatMode::AUTO) {
_compat_mode = CompatMode::ON;
} else { // CompatMode::OFF
throw;
}
};

try {
_fd_direct_on = open_fd(file_path, flags, true, mode);
} catch (const std::system_error&) {
_compat_mode = CompatMode::ON;
handle_o_direct_except();
} catch (const std::invalid_argument&) {
_compat_mode = CompatMode::ON;
handle_o_direct_except();
}

if (_compat_mode == CompatMode::ON) { return; }

// Create a cuFile handle, if not in compatibility mode
if (!is_compat_mode_preferred()) {
CUfileDescr_t desc{}; // It is important to set to zero!
desc.type = CU_FILE_HANDLE_TYPE_OPAQUE_FD;
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-union-access)
desc.handle.fd = _fd_direct_on;
CUFILE_TRY(cuFileAPI::instance().HandleRegister(&_handle, &desc));
CUfileDescr_t desc{}; // It is important to set to zero!
desc.type = CU_FILE_HANDLE_TYPE_OPAQUE_FD;
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-union-access)
desc.handle.fd = _fd_direct_on;

auto error_code = cuFileAPI::instance().HandleRegister(&_handle, &desc);
// For the AUTO mode, if the first cuFile API call fails, fall back to the compatibility
// mode.
if (_compat_mode == CompatMode::AUTO && error_code.err != CU_FILE_SUCCESS) {
_compat_mode = CompatMode::ON;
} else {
CUFILE_TRY(error_code);
}
}

Expand Down
Loading