Skip to content

Commit fd4a585

Browse files
committed
Update runs-on label to macos-12
Signed-off-by: Junqiu Lei <[email protected]>
1 parent 6f4fe91 commit fd4a585

1 file changed

Lines changed: 6 additions & 28 deletions

File tree

.github/workflows/CI.yml

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo "avx2 not available on system"
6262
su `id -un 1000` -c "whoami && java -version && ./gradlew build -Dsimd.enabled=false"
6363
fi
64-
64+
6565
6666
- name: Upload Coverage Report
6767
uses: codecov/codecov-action@v1
@@ -75,7 +75,7 @@ jobs:
7575

7676
name: Build and Test k-NN Plugin on MacOS
7777
needs: Get-CI-Image-Tag
78-
runs-on: macos-latest
78+
runs-on: macos-12
7979

8080
steps:
8181
- name: Checkout k-NN
@@ -92,39 +92,17 @@ jobs:
9292
with:
9393
java-version: ${{ matrix.java }}
9494

95-
- name: Build native libraries
95+
- name: Install dependencies on macos
9696
run: |
97-
git submodule update --init --recursive
9897
brew reinstall gcc
99-
brew install llvm
100-
brew install openblas
101-
export FC=/opt/homebrew/bin/gfortran
102-
export PATH=/opt/homebrew/opt/llvm/bin:$PATH
103-
export CC=/opt/homebrew/opt/llvm/bin/clang
104-
export CXX=/opt/homebrew/opt/llvm/bin/clang++
105-
cd jni
106-
sed -i -e 's/\/usr\/local\/opt\/libomp\//\/opt\/homebrew\/opt\/llvm\//g' cmake/init-faiss.cmake
107-
sed -i -e 's/__aarch64__/__undefine_aarch64__/g' external/faiss/faiss/utils/distances_simd.cpp
108-
sed -i -e 's/pragma message WARN/pragma message /g' external/nmslib/similarity_search/src/distcomp_scalar.cc
109-
sed -i -e 's/-march=native/-mcpu=apple-m1/g' external/nmslib/similarity_search/CMakeLists.txt
110-
sed -i -e 's/-mcpu=apple-a14/-mcpu=apple-m1/g' external/nmslib/python_bindings/setup.py
111-
if sysctl -n machdep.cpu.features | grep -i AVX2;
112-
then
113-
echo "avx2 available on system"
114-
cmake . --fresh
115-
else
116-
echo "avx2 not available on system"
117-
cmake . --fresh -DSIMD_ENABLED=true
118-
fi
119-
cmake . --fresh
120-
make
98+
export FC=/usr/local/Cellar/gcc/12.2.0/bin/gfortran
12199
122100
- name: Run build
123101
run: |
124-
if sysctl -n machdep.cpu.features | grep -i AVX2;
102+
if sysctl -n machdep.cpu.features machdep.cpu.leaf7_features | grep -i AVX2
125103
then
126104
echo "avx2 available on system"
127-
./gradlew build
105+
./gradlew build
128106
else
129107
echo "avx2 not available on system"
130108
./gradlew build -Dsimd.enabled=false

0 commit comments

Comments
 (0)