Fix up includes

facebookresearch · May 17, 2024 · 7eab341 · 7eab341
1 parent e822a8c
commit 7eab341
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 180 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,188 +11,10 @@ env:
   OMP_NUM_THREADS: '10'
   MKL_THREADING_LAYER: GNU
 jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - name: Install clang-format
-        run: |
-            sudo apt-get update -y
-            sudo apt-get install -y wget
-            sudo apt install -y lsb-release wget software-properties-common gnupg
-            wget https://apt.llvm.org/llvm.sh
-            chmod u+x llvm.sh
-            sudo ./llvm.sh 18
-            sudo apt-get install -y git-core clang-format-18
-      - name: Verify clang-format
-        run: |
-            git ls-files | grep -E  '\.(cpp|h|cu|cuh)$' | xargs clang-format-18 -i
-            if git diff --quiet; then
-              echo "Formatting OK!"
-            else
-              echo "Formatting not OK!"
-              echo "------------------"
-              git --no-pager diff --color
-              exit 1
-            fi
-  linux-x86_64-cmake:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - uses: ./.github/actions/build_cmake
-  linux-x86_64-AVX2-cmake:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - uses: ./.github/actions/build_cmake
-        with:
-          opt_level: avx2
-  linux-x86_64-AVX512-cmake:
-    if: false # TODO: enable when GitHub Actions adds AVX-512 hosts
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - uses: ./.github/actions/build_cmake
-        with:
-          opt_level: avx512
-  linux-x86_64-GPU-cmake:
-    needs: linux-x86_64-AVX2-cmake
-    runs-on: 4-core-ubuntu-gpu-t4
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - uses: ./.github/actions/build_cmake
-        with:
-          gpu: ON
-  linux-x86_64-GPU-w-RAFT-cmake:
-    runs-on: 4-core-ubuntu-gpu-t4
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-      - uses: ./.github/actions/build_cmake
-        with:
-          gpu: ON
-          raft: ON
-  linux-x86_64-conda:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-  windows-x86_64-conda:
-    runs-on: windows-2019
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-  linux-arm64-conda:
-    runs-on: 2-core-ubuntu-arm
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-  linux-x86_64-packages:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-        with:
-          label: main
-  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
-    env:
-      CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-        with:
-          label: main
-          raft: "ON"
-          cuda: "11.8.0"
-          compiler_version: "11.2"
-  linux-x86_64-GPU-packages-CUDA-12-1-1:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+  linux-x86_64-GPU-packages-CUDA-11-4-4:
     runs-on: 4-core-ubuntu-gpu-t4
     env:
-      CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-        with:
-          label: main
-          cuda: "12.1.1"
-          compiler_version: "11.2"
-  linux-x86_64-GPU-RAFT-packages-CUDA12-1-1:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    runs-on: 4-core-ubuntu-gpu-t4
-    env:
-      CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-        with:
-          label: main
-          raft: "ON"
-          cuda: "12.1.1"
-          compiler_version: "11.2"
-  windows-x86_64-packages:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    runs-on: windows-2019
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-        with:
-          label: main
-  osx-arm64-packages:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    runs-on: macos-14
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - uses: ./.github/actions/build_conda
-        with:
-          label: main
-  linux-arm64-packages:
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    runs-on: 2-core-ubuntu-arm
+      CUDA_ARCHS: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
     steps:
       - name: Checkout
         uses: actions/checkout@v4.1.1
@@ -202,3 +24,5 @@ jobs:
       - uses: ./.github/actions/build_conda
         with:
           label: main
+          cuda: "11.4.4"
+          compiler_version: "11.2"
diff --git a/conda/faiss-gpu/build-lib.sh b/conda/faiss-gpu/build-lib.sh
@@ -6,6 +6,9 @@
 
 set -e
 
+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/
 
 # Build libfaiss.so/libfaiss_avx2.so/libfaiss_avx512.so
 cmake -B _build \