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

[FEA] Support for half-float mixed precise in brute-force #2382

Merged
merged 20 commits into from
Aug 22, 2024
Merged

[FEA] Support for half-float mixed precise in brute-force #2382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0780518
[FEA] Support for half-float mixed precise in brute-force
rhdong Jul 17, 2024
0e9e70b
Merge branch 'branch-24.08' into half_knn
rhdong Jul 17, 2024
3dd5fdf
recover the test cases
rhdong Jul 17, 2024
eb3b8a6
try to fix sddmm error in conda-cpp-tests
rhdong Jul 18, 2024
60ff874
check sparse
rhdong Jul 19, 2024
6103fd1
fix the Floating-point exception
rhdong Jul 19, 2024
d744d59
Merge remote-tracking branch 'origin/branch-24.08' into half_knn
rhdong Jul 19, 2024
efec888
conditionally skip sddmm test cases
rhdong Jul 19, 2024
a55f100
conditionally skip sddmm test cases(2nd try)
rhdong Jul 22, 2024
920997f
half2float -> to_float
rhdong Jul 22, 2024
f2f21c4
Merge branch 'branch-24.08' into half_knn
rhdong Jul 23, 2024
43ee640
CI fix caused by half2float -> to_float
rhdong Jul 23, 2024
11a9988
Merge branch 'branch-24.10' into half_knn
rhdong Jul 26, 2024
aa6da25
Merge branch 'branch-24.10' into half_knn
rhdong Aug 1, 2024
3d8b7ca
update masked_matmul to support mixed precision
rhdong Aug 1, 2024
34dbde8
fix CI fail by skipping low version cuSparse
rhdong Aug 1, 2024
10e5204
fix: illegal instruction by `masked_matmul` on V100 with a dim not mu…
rhdong Aug 9, 2024
4046bf8
Merge branch 'branch-24.10' into half_knn
rhdong Aug 13, 2024
1ed4801
[Fix] bug of `masked_matmul` on non-2-power of `num_cols`
rhdong Aug 13, 2024
4d55c57
[Fix] compilation error of `gemm` & `transpose` under cuml
rhdong Aug 21, 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
Prev Previous commit
Next Next commit
fix CI fail by skipping low version cuSparse
  • Loading branch information
@rhdong
rhdong committed Aug 1, 2024
commit 34dbde8c364f4b37b316a724d86bf2eb7f56be00
35 changes: 29 additions & 6 deletions cpp/test/sparse/masked_matmul.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <thrust/reduce.h>

#include <cusparse.h>
#include <gtest/gtest.h>

#include <iostream>
Expand Down Expand Up @@ -67,6 +68,22 @@ template <typename value_t, typename output_t, typename index_t>
return os;
}

bool isCuSparseVersionGreaterThan_12_0_1()
{
int version;
cusparseHandle_t handle;
cusparseCreate(&handle);
cusparseGetVersion(handle, &version);

int major = version / 1000;
int minor = (version % 1000) / 100;
int patch = version % 100;

cusparseDestroy(handle);

return (major > 12) || (major == 12 && minor > 0) || (major == 12 && minor == 0 && patch >= 2);
}

template <typename value_t,
typename output_t,
typename index_t,
Expand Down Expand Up @@ -272,7 +289,13 @@ class MaskedMatmulTest
resource::sync_stream(handle);
}

void SetUp() override { make_data(); }
void SetUp() override
{
if (std::is_same_v<value_t, half> && !isCuSparseVersionGreaterThan_12_0_1()) {
GTEST_SKIP() << "Skipping all tests for half-float as cuSparse doesn't support it.";
}
make_data();
}

void Run()
{
Expand Down Expand Up @@ -360,14 +383,14 @@ const std::vector<MaskedMatmulInputs<double, double, int>> sddmm_inputs_d = {
{0.0001f, 1024, 1024, 1024, 0.1, 1234ULL}};

const std::vector<MaskedMatmulInputs<half, float, int>> sddmm_inputs_h = {
{0.0001f, 10, 5, 32, 0.01, 1234ULL},
{0.0001f, 10, 5, 32, 0.1, 1234ULL},
{0.0001f, 1024, 32, 1024, 0.1, 1234ULL},
{0.0001f, 32, 1024, 1024, 0.2, 1234ULL},
{0.0001f, 1024, 1024, 1024, 0.19, 1234ULL},
{0.0003f, 32, 1024, 1024, 0.2, 1234ULL},
{0.001f, 1024, 1024, 1024, 0.19, 1234ULL},
{0.0001f, 1024, 1024, 32, 0.3, 1234ULL},
{0.0001f, 1024, 32, 1024, 0.4, 1234ULL},
{0.0001f, 32, 1024, 1024, 0.19, 1234ULL},
{0.0001f, 1024, 1024, 1024, 0.1, 1234ULL}};
{0.0003f, 32, 1024, 1024, 0.19, 1234ULL},
{0.001f, 1024, 1024, 1024, 0.1, 1234ULL}};

INSTANTIATE_TEST_CASE_P(MaskedMatmulTest, MaskedMatmulTestF, ::testing::ValuesIn(sddmm_inputs_f));

Expand Down
32 changes: 16 additions & 16 deletions cpp/test/sparse/sddmm.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,6 @@ template <typename ValueType, typename IndexType>
return os;
}

bool isCuSparseVersionGreaterThan_12_0_1()
{
int version;
cusparseHandle_t handle;
cusparseCreate(&handle);
cusparseGetVersion(handle, &version);

int major = version / 1000;
int minor = (version % 1000) / 100;
int patch = version % 100;

cusparseDestroy(handle);

return (major > 12) || (major == 12 && minor > 0) || (major == 12 && minor == 0 && patch >= 2);
}

template <typename ValueType,
typename IndexType,
typename LayoutPolicyA = raft::layout_c_contiguous,
Expand All @@ -113,6 +97,22 @@ class SDDMMTest : public ::testing::TestWithParam<SDDMMInputs<ValueType, IndexTy
}

protected:
bool isCuSparseVersionGreaterThan_12_0_1()
{
int version;
cusparseHandle_t handle;
cusparseCreate(&handle);
cusparseGetVersion(handle, &version);

int major = version / 1000;
int minor = (version % 1000) / 100;
int patch = version % 100;

cusparseDestroy(handle);

return (major > 12) || (major == 12 && minor > 0) || (major == 12 && minor == 0 && patch >= 2);
}

IndexType create_sparse_matrix(IndexType m,
IndexType n,
OutputType sparsity,
Expand Down
Loading