Skip to content

Commit 3adc5c9

Browse files
Merge cmake command in the cmake build action
Summary: Simplify the cmake command in the cmake build action Differential Revision: D60427830
1 parent c154bc1 commit 3adc5c9

1 file changed

Lines changed: 12 additions & 29 deletions

File tree

.github/actions/build_cmake/action.yml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,18 @@ runs:
6565
run: |
6666
eval "$(conda shell.bash hook)"
6767
conda activate
68-
69-
if [ "${{ runner.arch }}" = "X64" ]; then
70-
cmake -B build \
71-
-DBUILD_TESTING=ON \
72-
-DBUILD_SHARED_LIBS=ON \
73-
-DFAISS_ENABLE_GPU=${{ inputs.gpu }} \
74-
-DFAISS_ENABLE_RAFT=${{ inputs.raft }} \
75-
-DFAISS_OPT_LEVEL=${{ inputs.opt_level }} \
76-
-DFAISS_ENABLE_C_API=ON \
77-
-DPYTHON_EXECUTABLE=$CONDA/bin/python \
78-
-DCMAKE_BUILD_TYPE=Release \
79-
-DBLA_VENDOR=Intel10_64_dyn \
80-
-DCMAKE_CUDA_FLAGS="-gencode arch=compute_75,code=sm_75" \
81-
.
82-
elif [ "${{ runner.arch }}" = "ARM64" ]; then
83-
cmake -B build \
84-
-DBUILD_TESTING=ON \
85-
-DBUILD_SHARED_LIBS=ON \
86-
-DFAISS_ENABLE_GPU=${{ inputs.gpu }} \
87-
-DFAISS_ENABLE_RAFT=${{ inputs.raft }} \
88-
-DFAISS_OPT_LEVEL=${{ inputs.opt_level }} \
89-
-DFAISS_ENABLE_C_API=ON \
90-
-DPYTHON_EXECUTABLE=$CONDA/bin/python \
91-
-DCMAKE_BUILD_TYPE=Release \
92-
.
93-
else
94-
echo "Encountered unexpected platform ${{ runner.arch }}"
95-
exit 1
96-
fi
68+
cmake -B build \
69+
-DBUILD_TESTING=ON \
70+
-DBUILD_SHARED_LIBS=ON \
71+
-DFAISS_ENABLE_GPU=${{ inputs.gpu }} \
72+
-DFAISS_ENABLE_RAFT=${{ inputs.raft }} \
73+
-DFAISS_OPT_LEVEL=${{ inputs.opt_level }} \
74+
-DFAISS_ENABLE_C_API=ON \
75+
-DPYTHON_EXECUTABLE=$CONDA/bin/python \
76+
-DCMAKE_BUILD_TYPE=Release \
77+
-DBLA_VENDOR=${{ runner.arch == 'ARM64' && '' || 'Intel10_64_dyn' }} \
78+
-DCMAKE_CUDA_FLAGS=${{ runner.arch == 'ARM64' && '' || '"-gencode arch=compute_75,code=sm_75"' }} \
79+
.
9780
make -k -C build -j$(nproc)
9881
- name: C++ tests
9982
shell: bash

0 commit comments

Comments
 (0)