Revert "Use Ninja for builds"

This reverts commit dcb536e.
conda-forge · Jan 5, 2023 · 0f46165 · 0f46165
1 parent 7649144
commit 0f46165
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/recipe/build-lib.bat b/recipe/build-lib.bat
@@ -38,7 +38,6 @@ if "%cuda_compiler_version%"=="None" (
 
 :: Build faiss.dll depending on $CF_FAISS_BUILD (either "generic" or "avx2")
 cmake %CMAKE_ARGS% ^
-    -GNinja ^
     -DBUILD_SHARED_LIBS=ON ^
     -DBUILD_TESTING=OFF ^
     -DFAISS_OPT_LEVEL=%CF_FAISS_BUILD% ^

diff --git a/recipe/build-lib.sh b/recipe/build-lib.sh
@@ -50,7 +50,6 @@ fi
 
 # Build version depending on $CF_FAISS_BUILD (either "generic" or "avx2")
 cmake ${CMAKE_ARGS} \
-    -GNinja \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_TESTING=${BUILD_TESTING} \
     -DFAISS_OPT_LEVEL=${CF_FAISS_BUILD} \

diff --git a/recipe/build-pkg.bat b/recipe/build-pkg.bat
@@ -9,8 +9,7 @@ if "%cuda_compiler_version%"=="None" (
 )
 
 :: Build vanilla version (no avx2), see build-lib.bat
-cmake -GNinja ^
-    -B _build_python_generic ^
+cmake -B _build_python_generic ^
     -Dfaiss_ROOT=_libfaiss_generic_stage ^
     -DFAISS_ENABLE_GPU=!FAISS_ENABLE_GPU! ^
     -DCMAKE_BUILD_TYPE=Release ^

diff --git a/recipe/build-pkg.sh b/recipe/build-pkg.sh
@@ -10,7 +10,6 @@ fi
 
 # Build vanilla version (no avx2), see build-lib.sh
 cmake ${CMAKE_ARGS} \
-    -GNinja \
     -Dfaiss_ROOT=_libfaiss_generic_stage/ \
     -DFAISS_ENABLE_GPU=${FAISS_ENABLE_GPU} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -22,7 +21,6 @@ cmake --build _build_python_generic --target swigfaiss -j $CPU_COUNT
 # Build version with avx2 support, see build-lib.sh
 if [[ "${target_platform}" == *-64 ]]; then
     cmake ${CMAKE_ARGS} \
-        -GNinja \
         -Dfaiss_ROOT=_libfaiss_avx2_stage/ \
         -DFAISS_OPT_LEVEL=avx2 \
         -DFAISS_ENABLE_GPU=${FAISS_ENABLE_GPU} \

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -100,6 +100,7 @@ build:
 requirements:
   build:
     - {{ compiler('cxx') }}
+    - make  # [linux]
 
 outputs:
   # A meta-package to select CPU or GPU build for faiss.
@@ -141,7 +142,7 @@ outputs:
         - {{ compiler('cxx') }}
         - {{ compiler('cuda') }}  # [cuda_compiler_version != "None"]
         - cmake
-        - ninja
+        - make                    # [linux]
         - libgomp                 # [linux]
         - llvm-openmp             # [osx]
       host:
@@ -184,7 +185,7 @@ outputs:
         - {{ compiler('cuda') }}  # [cuda_compiler_version != "None"]
         - swig
         - cmake
-        - ninja
+        - make                    # [linux]
         - libgomp                 # [linux]
         - llvm-openmp             # [osx]
       host: