diff --git a/.github/actions/build_cmake/action.yml b/.github/actions/build_cmake/action.yml index a46462c8d9..cd023aaca7 100644 --- a/.github/actions/build_cmake/action.yml +++ b/.github/actions/build_cmake/action.yml @@ -16,7 +16,7 @@ runs: using: composite steps: - name: Setup miniconda - uses: conda-incubator/setup-miniconda@v3.0.3 + uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.11' miniconda-version: latest @@ -97,7 +97,7 @@ runs: FAISS_DISABLE_CPU_FEATURES=AVX2 LD_DEBUG=libs $CONDA/bin/python -c "import faiss" 2>&1 | grep faiss.so LD_DEBUG=libs $CONDA/bin/python -c "import faiss" 2>&1 | grep faiss_avx2.so - name: Upload test results - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4 with: name: test-results-${{ inputs.opt_level }}-${{ inputs.gpu }}-${{ inputs.raft }} path: test-results diff --git a/.github/actions/build_conda/action.yml b/.github/actions/build_conda/action.yml index ec407e6569..4658f13a8f 100644 --- a/.github/actions/build_conda/action.yml +++ b/.github/actions/build_conda/action.yml @@ -31,7 +31,7 @@ runs: echo "shell=pwsh" >> "$GITHUB_OUTPUT" fi - name: Setup miniconda - uses: conda-incubator/setup-miniconda@v3.0.3 + uses: conda-incubator/setup-miniconda@v3 with: python-version: '3.11' miniconda-version: latest diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a9114628c..3f31ae3b96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - name: Install clang-format run: | sudo apt-get update -y @@ -40,13 +40,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - uses: ./.github/actions/build_cmake linux-x86_64-AVX2-cmake: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - uses: ./.github/actions/build_cmake with: opt_level: avx2 @@ -55,7 +55,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - uses: ./.github/actions/build_cmake with: opt_level: avx512 @@ -64,7 +64,7 @@ jobs: runs-on: 4-core-ubuntu-gpu-t4 steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - uses: ./.github/actions/build_cmake with: gpu: ON @@ -72,7 +72,7 @@ jobs: runs-on: 4-core-ubuntu-gpu-t4 steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 - uses: ./.github/actions/build_cmake with: gpu: ON @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -90,7 +90,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -99,7 +99,7 @@ jobs: runs-on: 2-core-ubuntu-arm steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -109,13 +109,29 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true - uses: ./.github/actions/build_conda with: label: main + linux-x86_64-GPU-packages-CUDA-11-4-4: + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + runs-on: 4-core-ubuntu-gpu-t4 + env: + CUDA_ARCHS: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real" + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + - uses: ./.github/actions/build_conda + with: + label: main + cuda: "11.4.4" + compiler_version: "11.2" linux-x86_64-GPU-RAFT-packages-CUDA11-8-0: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') runs-on: 4-core-ubuntu-gpu-t4 @@ -123,7 +139,7 @@ jobs: CUDA_ARCHS: "70-real;72-real;75-real;80;86-real" steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -140,7 +156,7 @@ jobs: CUDA_ARCHS: "70-real;72-real;75-real;80;86-real" steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -156,7 +172,7 @@ jobs: CUDA_ARCHS: "70-real;72-real;75-real;80;86-real" steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -171,7 +187,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -183,7 +199,7 @@ jobs: runs-on: macos-14 steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true @@ -195,7 +211,7 @@ jobs: runs-on: 2-core-ubuntu-arm steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true diff --git a/conda/faiss-gpu/build-lib.sh b/conda/faiss-gpu/build-lib.sh index 2d25e9c5e6..41f4f02bbc 100755 --- a/conda/faiss-gpu/build-lib.sh +++ b/conda/faiss-gpu/build-lib.sh @@ -6,6 +6,12 @@ set -e +# Workaround for CUDA 11.4.4 builds. Moves all necessary headers to include root. +if [[ -n "$FAISS_FLATTEN_CONDA_INCLUDES" && "$FAISS_FLATTEN_CONDA_INCLUDES" == "1" ]]; then + cp -r -n $CONDA_PREFIX/x86_64-conda-linux-gnu/sysroot/usr/include/* $CONDA_PREFIX/include/ + cp -r -n $CONDA_PREFIX/x86_64-conda-linux-gnu/include/c++/11.2.0/* $CONDA_PREFIX/include/ + cp -r -n $CONDA_PREFIX/x86_64-conda-linux-gnu/include/c++/11.2.0/x86_64-conda-linux-gnu/* $CONDA_PREFIX/include/ +fi # Build libfaiss.so/libfaiss_avx2.so/libfaiss_avx512.so cmake -B _build \ diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 3d614df1bf..db6b4e243f 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -43,6 +43,9 @@ outputs: - {{ pin_compatible('libfaiss', exact=True) }} script_env: - CUDA_ARCHS + {% if cudatoolkit == '11.4.4' %} + - FAISS_FLATTEN_CONDA_INCLUDES=1 + {% endif %} requirements: build: - {{ compiler('cxx') }}