Skip to content

Re-enable Query_L2_MMCodeDistance and Query_IP_MMCodeDistance tests for ROCm #3838

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

Closed
ramilbakhshyiev wants to merge 3 commits into from
Closed

Re-enable Query_L2_MMCodeDistance and Query_IP_MMCodeDistance tests for ROCm #3838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf55868
Do not unnecessarily install CUDA for ROCm (#3837)
ramilbakhshyiev Sep 6, 2024
6eaa8ae
Upgrade to ROCm 6.2 (#3839)
ramilbakhshyiev Sep 6, 2024
3f46f9f
Re-enable Query_L2_MMCodeDistance and Query_IP_MMCodeDistance tests f…
ramilbakhshyiev Sep 6, 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
15 changes: 8 additions & 7 deletions .github/actions/build_cmake/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ runs:
conda install -y -q mkl=2023 mkl-devel=2023
fi

# install CUDA packages
if [ "${{ inputs.gpu }}" = "ON" ] && [ "${{ inputs.raft }}" = "OFF" ]; then
# no CUDA needed for ROCm so skip this
if [ "${{ inputs.rocm }}" = "ON" ]; then
:
# regular CUDA for GPU builds
elif [ "${{ inputs.gpu }}" = "ON" ] && [ "${{ inputs.raft }}" = "OFF" ]; then
conda install -y -q cuda-toolkit -c "nvidia/label/cuda-12.4.0"
fi

# install RAFT packages
if [ "${{ inputs.raft }}" = "ON" ]; then
# and CUDA from RAFT channel for RAFT builds
elif [ "${{ inputs.raft }}" = "ON" ]; then
conda install -y -q libraft cuda-version=12.4 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-12.4.0" -c conda-forge
fi

Expand All @@ -83,7 +84,7 @@ runs:
UBUNTU_VERSION_NAME=`cat /etc/os-release | grep UBUNTU_CODENAME | awk -F= '{print $2}'`

# Set ROCm version
ROCM_VERSION="6.1.1"
ROCM_VERSION="6.2"

# Download, prepare, and install the package signing key
mkdir --parents --mode=0755 /etc/apt/keyrings
Expand Down
3 changes: 0 additions & 3 deletions faiss/gpu/test/TestGpuIndexIVFPQ.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,16 +307,13 @@ void testMMCodeDistance(faiss::MetricType mt) {
}
}

// FIXME: https://github.com/facebookresearch/faiss/issues/3787
#ifndef USE_AMD_ROCM
TEST(TestGpuIndexIVFPQ, Query_L2_MMCodeDistance) {
testMMCodeDistance(faiss::MetricType::METRIC_L2);
}

TEST(TestGpuIndexIVFPQ, Query_IP_MMCodeDistance) {
testMMCodeDistance(faiss::MetricType::METRIC_INNER_PRODUCT);
}
#endif // USE_AMD_ROCM

TEST(TestGpuIndexIVFPQ, Float16Coarse) {
Options opt;
Expand Down