OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Stop installing libuv on Windows (#51936)

Browse Source 
Summary:
Fixes #{issue number}
gunandrose4u

Pull Request resolved: https://github.com/pytorch/pytorch/pull/51936

Reviewed By: malfet

Differential Revision: D28467662

Pulled By: seemethere

fbshipit-source-id: 28d203ee3af13d6a3158f188c2e889e310ee6010
This commit is contained in:
peter 2021-05-17 08:49:47 -07:00 committed by Facebook GitHub Bot
parent 1ad06ba3f5
commit 432676599c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/pytorch/win-test-helpers/setup_pytorch_env.bat
View File

@ -22,7 +22,7 @@ call %CONDA_PARENT_DIR%\Miniconda3\Scripts\activate.bat %CONDA_PARENT_DIR%\Minic
if NOT "%BUILD_ENVIRONMENT%"=="" (
:: We have to pin Python version to 3.6.7, until mkl supports Python 3.7
:: Numba is pinned to 0.44.0 to avoid https://github.com/numba/numba/issues/4352
call conda install -y -q python=3.6.7 numpy mkl cffi pyyaml boto3 protobuf numba==0.44.0 scipy==1.5.0 typing_extensions dataclasses
call conda install -y -q python=3.6.7 numpy mkl cffi pyyaml boto3 protobuf numba==0.44.0 scipy==1.5.0 typing_extensions dataclasses libuv
if %errorlevel% neq 0 ( exit /b %errorlevel% )
call conda install -y -q -c conda-forge cmake
if %errorlevel% neq 0 ( exit /b %errorlevel% )

8
cmake/Dependencies.cmake
View File

@ -1308,7 +1308,13 @@ if(USE_GLOO)
message(WARNING "Gloo can only be used on 64-bit systems.")
caffe2_update_option(USE_GLOO OFF)
else()
set(GLOO_INSTALL ON CACHE BOOL "" FORCE)
if(MSVC)
# Don't install gloo on Windows
# It is already handled in builder scripts
set(GLOO_INSTALL OFF CACHE BOOL "" FORCE)
else()
set(GLOO_INSTALL ON CACHE BOOL "" FORCE)
endif()
set(GLOO_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE)
# Temporarily override variables to avoid building Gloo tests/benchmarks