Skip to content

Commit

Permalink
Revert "CMAKE_GENERATOR workaround for vs2019 from conda-forge"
Browse files Browse the repository at this point in the history
This reverts commit 66f583e.
  • Loading branch information
h-vetinari committed Mar 9, 2021
1 parent fff089d commit 7adea1f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions recipe/build-lib.bat
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ if "%cuda_compiler_version%"=="None" (
echo Set up extra cmake-args: CUDA_CONFIG_ARGS=!CUDA_CONFIG_ARGS!
)

:: workaround for https://github.com/conda-forge/vc-feedstock/issues/21
set "CMAKE_GENERATOR=Visual Studio 16 2019"

:: Build faiss.dll depending on $CF_FAISS_BUILD (either "generic" or "avx2")
cmake -B _build_%CF_FAISS_BUILD% ^
-DBUILD_SHARED_LIBS=ON ^
Expand Down
3 changes: 0 additions & 3 deletions recipe/build-pkg.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ if "%cuda_compiler_version%"=="None" (
set "CUDAToolkit_ROOT=%CUDA_PATH%"
)

:: workaround for https://github.com/conda-forge/vc-feedstock/issues/21
set "CMAKE_GENERATOR=Visual Studio 16 2019"

:: Build vanilla version (no avx2), see build-lib.bat
cmake -B _build_python_generic ^
-Dfaiss_ROOT=_libfaiss_generic_stage ^
Expand Down

0 comments on commit 7adea1f

Please sign in to comment.